Merge branch 'merge-requests/108'
This commit is contained in:
David Black
commit
57e8d7aac9
17
metadata/com.seb.SLWP.txt
Normal file
17
metadata/com.seb.SLWP.txt
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Category:Wallpaper
|
||||
License:GPL/Artistic
|
||||
Web Site:http://code.google.com/p/earth-live-wallpaper/
|
||||
Source Code:http://code.google.com/p/earth-live-wallpaper/source/checkout
|
||||
Issue Tracker:http://code.google.com/p/earth-live-wallpaper/issues/list
|
||||
|
||||
Summary:Live wallpaper with rotating planets
|
||||
Description:
|
||||
Live wallpaper showing photorealistic and daytime-synchronized
|
||||
images of Earth and other planets flying thru space.
|
||||
.
|
||||
|
||||
Repo Type:git-svn
|
||||
# Note the starting space in a subdir name
|
||||
Repo:http://earth-live-wallpaper.googlecode.com/svn/trunk/ earth-live-wallpaper/SLWP
|
||||
|
||||
Build Version:1.4,60,61,target=android-9,patch=scoping-fix.patch;handle-no-market.patch;fix-appname.patch;button-name.patch
|
||||
15
metadata/com.seb.SLWP/button-name.patch
Normal file
15
metadata/com.seb.SLWP/button-name.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Use consistent capitalization on button name.
|
||||
|
||||
diff --git a/res/layout/prefliste.xml b/res/layout/prefliste.xml
|
||||
index c503322..2161049 100644
|
||||
--- a/res/layout/prefliste.xml
|
||||
+++ b/res/layout/prefliste.xml
|
||||
@@ -2,7 +2,7 @@
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
|
||||
-<RelativeLayout android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon" android:layout_alignParentLeft="true" android:layout_marginLeft="3dp"></ImageView><Button android:layout_centerVertical="true" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="Help" android:id="@+id/bt_help" android:layout_toLeftOf="@+id/bt_donate"></Button><Button android:layout_toRightOf="@+id/TextView01" android:layout_centerVertical="true" android:layout_width="wrap_content" android:id="@+id/bt_donate" android:layout_alignParentRight="true" android:layout_height="wrap_content" android:text="map pack"></Button>
|
||||
+<RelativeLayout android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon" android:layout_alignParentLeft="true" android:layout_marginLeft="3dp"></ImageView><Button android:layout_centerVertical="true" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="Help" android:id="@+id/bt_help" android:layout_toLeftOf="@+id/bt_donate"></Button><Button android:layout_toRightOf="@+id/TextView01" android:layout_centerVertical="true" android:layout_width="wrap_content" android:id="@+id/bt_donate" android:layout_alignParentRight="true" android:layout_height="wrap_content" android:text="Map pack"></Button>
|
||||
|
||||
</RelativeLayout>
|
||||
<ListView android:layout_width="fill_parent" android:id="@+id/android:list" android:layout_height="wrap_content"></ListView>
|
||||
39
metadata/com.seb.SLWP/fix-appname.patch
Normal file
39
metadata/com.seb.SLWP/fix-appname.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
Use consistent appname which is used on website: http://code.google.com/p/earth-live-wallpaper/
|
||||
|
||||
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
|
||||
index a3f9b91..5c89079 100644
|
||||
--- a/res/values-es/strings.xml
|
||||
+++ b/res/values-es/strings.xml
|
||||
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="hello">Hello World, SLWP!</string>
|
||||
- <string name="app_name">EarthRot</string>
|
||||
<string name="description">rotación Globe (OpenGL VBO)</string>
|
||||
<string name="p_speed">velocidad</string>
|
||||
<string name="p_speedsum">Elija la velocidad de rotación de la Tierra
|
||||
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
|
||||
index 7d1e443..32d857c 100644
|
||||
--- a/res/values-fr/strings.xml
|
||||
+++ b/res/values-fr/strings.xml
|
||||
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="hello">Hello World, SLWP!</string>
|
||||
- <string name="app_name">EarthRot</string>
|
||||
<string name="description">Globe terrestre rotatif (Opengl VBO)</string>
|
||||
<string name="p_speed">Vitesse de rotation</string>
|
||||
<string name="p_speedsum">Choisissez la vitesse de rotation du globe</string>
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 501db7e..99d20aa 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="hello">Hello World, SLWP!</string>
|
||||
- <string name="app_name">EarthRot</string>
|
||||
+ <string name="app_name">Earth Live Wallpaper</string>
|
||||
<string name="description">Rotating earth globe (Opengl VBO)</string>
|
||||
|
||||
|
||||
23
metadata/com.seb.SLWP/handle-no-market.patch
Normal file
23
metadata/com.seb.SLWP/handle-no-market.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/src/com/seb/SLWP/Prefs.java b/src/com/seb/SLWP/Prefs.java
|
||||
index 900ff3d..9a1691f 100755
|
||||
--- a/src/com/seb/SLWP/Prefs.java
|
||||
+++ b/src/com/seb/SLWP/Prefs.java
|
||||
@@ -75,11 +75,17 @@ public class Prefs extends PreferenceActivity implements
|
||||
bg.setOnPreferenceChangeListener(this);
|
||||
initMapList();
|
||||
Button bt = (Button) findViewById(R.id.bt_donate);
|
||||
+ final PreferenceActivity myact = this;
|
||||
bt.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
- startActivity(new Intent(Intent.ACTION_VIEW, Uri
|
||||
+ try {
|
||||
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri
|
||||
.parse("market://search?q=pub:unixseb")));
|
||||
+ } catch (Exception e) {
|
||||
+ Log.e("SLWP", "Cannot open 'market:' link", e);
|
||||
+ Toast.makeText(myact, "Cannot launch Market", Toast.LENGTH_SHORT).show();
|
||||
+ }
|
||||
}
|
||||
});
|
||||
Button bth = (Button) findViewById(R.id.bt_help);
|
||||
13
metadata/com.seb.SLWP/scoping-fix.patch
Normal file
13
metadata/com.seb.SLWP/scoping-fix.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/SLWP.java b/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/SLWP.java
|
||||
index d94d995..ca46e26 100644
|
||||
--- a/src/com/seb/SLWP/SLWP.java
|
||||
+++ b/src/com/seb/SLWP/SLWP.java
|
||||
@@ -590,7 +590,7 @@ public class SLWP extends GLWallpaperService implements
|
||||
return mGle;
|
||||
}
|
||||
|
||||
- class GlEngine extends GLEngine {
|
||||
+ class GlEngine extends GLWallpaperService.GLEngine {
|
||||
|
||||
private static final float TOUCH_SCALE_FACTOR = 1E-3f;
|
||||
private float mPreviousX = 0.0f;
|
||||
Loading…
Reference in a new issue