Merge branch 'release-1.5.1'

rsteckler · Oct 23, 2014 · 5f900f8 · 5f900f8
2 parents 85bea2f + 9d55cba
commit 5f900f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId 'com.ryansteckler.nlpunbounce'
         minSdkVersion 16
         targetSdkVersion 20
-        versionCode 33
-        versionName '1.5'
+        versionCode 34
+        versionName '1.5.1'
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="Unbounce"
+        android:label="@string/app_name"
         android:theme="@style/UnbounceThemeDark" >
         <meta-data
             android:name="xposedmodule"
@@ -20,7 +20,7 @@
             android:value="42" />
         <meta-data
             android:name="xposeddescription"
-            android:value="Control alarms and wakelocks" />
+            android:value="Tame your alarms, wakelocks and services" />
 
         <activity
             android:name=".SettingsActivity"

diff --git a/app/src/main/java/com/ryansteckler/nlpunbounce/hooks/Wakelocks.java b/app/src/main/java/com/ryansteckler/nlpunbounce/hooks/Wakelocks.java
@@ -38,7 +38,7 @@
 public class Wakelocks implements IXposedHookLoadPackage {
 
     private static final String TAG = "Unbounce: ";
-    private static final String VERSION = "1.5"; //This needs to be pulled from the manifest or gradle build.
+    private static final String VERSION = "1.5.1"; //This needs to be pulled from the manifest or gradle build.
     private HashMap<String, Long> mLastWakelockAttempts = null; //The last time each wakelock was allowed.
     private HashMap<String, Long> mLastAlarmAttempts = null; //The last time each alarm was allowed.
     private HashMap<String, Long> mLastServiceAttempts = null; //The last time each wakelock was allowed.

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -56,7 +56,7 @@
             android:key="about_author"
             android:editable="false"
             android:defaultValue="0"
-            android:summary="Version: 1.5"
+            android:summary="Version: 1.5.1"
             />
 
         <Preference