Rebase of Francesco

Fix build and libs cleanup

Change-Id: I6d81cb271874595966d76f391b516359bdaeac4d

10 files changed, 48 insertions, 43 deletions

diff --git a/Android.mk b/Android.mk
index e5ad862..111ced2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 roottools renderscript google
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 roottools renderscript google nineoldandroids
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -15,7 +15,7 @@ include $(BUILD_PACKAGE)
 ##################################################
 include $(CLEAR_VARS)
 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := roottools:RootTools.jar renderscript:renderscript-v8.jar google:libGoogleAnalyticsServices.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := roottools:libs/RootTools.jar renderscript:libs/renderscript-v8.jar google:libs/libGoogleAnalyticsServices.jar nineoldandroids:libs/nineoldandroids-2.4.0.jar
 
 include $(BUILD_MULTI_PREBUILT)
 
diff --git a/gen/com/dsht/kerneltweaker/R.java b/gen/com/dsht/kerneltweaker/R.java
index 3ed4c64..0de97e0 100644
--- a/gen/com/dsht/kerneltweaker/R.java
+++ b/gen/com/dsht/kerneltweaker/R.java
@@ -620,12 +620,12 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int activity_container=0x7f060018;
         public static final int backup_boot=0x7f060023;
         public static final int backup_recovery=0x7f060028;
-        public static final int btn_apply=0x7f06004b;
-        public static final int btn_cancel=0x7f06004c;
-        public static final int btn_layout=0x7f06004a;
+        public static final int btn_apply=0x7f06004c;
+        public static final int btn_cancel=0x7f06004d;
+        public static final int btn_layout=0x7f06004b;
         public static final int button1=0x7f060046;
-        public static final int button2=0x7f060047;
-        public static final int button3=0x7f060049;
+        public static final int button2=0x7f060048;
+        public static final int button3=0x7f06004a;
         public static final int calendar_color_view=0x7f060036;
         public static final int cancel=0x7f06003e;
         public static final int cb=0x7f060053;
@@ -662,16 +662,16 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int icon=0x7f060043;
         public static final int image=0x7f060024;
         public static final int image2=0x7f060029;
-        public static final int imageView1=0x7f060045;
+        public static final int imageView1=0x7f060047;
         public static final int info=0x7f060044;
         public static final int item_container=0x7f060040;
         public static final int kernel_info=0x7f060037;
         public static final int left=0x7f060000;
-        public static final int list=0x7f06004d;
+        public static final int list=0x7f06004e;
         public static final int margin=0x7f060002;
         public static final int mem_info=0x7f060039;
-        public static final int menu_frame=0x7f060050;
-        public static final int menu_header=0x7f060051;
+        public static final int menu_frame=0x7f060051;
+        public static final int menu_header=0x7f060052;
         public static final int name=0x7f060041;
         public static final int navbarlist=0x7f06002d;
         public static final int next_button=0x7f06006e;
@@ -679,7 +679,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int onLongPress=0x7f060015;
         public static final int onMove=0x7f060014;
         public static final int pager=0x7f060017;
-        public static final int preset_layout=0x7f06004e;
+        public static final int preset_layout=0x7f06004f;
         public static final int prev_button=0x7f06006d;
         public static final int reboot=0x7f06003f;
         public static final int refresh=0x7f06006f;
@@ -689,12 +689,12 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int rotatedown=0x7f06000f;
         public static final int rotateup=0x7f06000e;
         public static final int sb_blur=0x7f06006b;
-        public static final int scrollView1=0x7f06004f;
+        public static final int scrollView1=0x7f060050;
         public static final int seek_bar=0x7f060059;
         public static final int seekbar=0x7f060056;
         public static final int seekbar_dialog=0x7f060058;
         public static final int selected_view=0x7f060004;
-        public static final int separator=0x7f060052;
+        public static final int separator=0x7f060045;
         public static final int setting_text=0x7f06005a;
         public static final int slidingmenumain=0x7f06005b;
         public static final int speed=0x7f060061;
@@ -724,7 +724,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int ui_total_state_time=0x7f060064;
         public static final int value=0x7f060042;
         public static final int view1=0x7f060027;
-        public static final int view2=0x7f060048;
+        public static final int view2=0x7f060049;
         public static final int wall=0x7f060069;
         public static final int zoomin=0x7f06000c;
         public static final int zoomout=0x7f06000d;
@@ -747,27 +747,28 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int dragsort_list_item=0x7f03000e;
         public static final int empty_test=0x7f03000f;
         public static final int file_list_item=0x7f030010;
-        public static final int header=0x7f030011;
-        public static final int info_preference=0x7f030012;
-        public static final int layout_list=0x7f030013;
-        public static final int layout_list_file=0x7f030014;
-        public static final int list_item=0x7f030015;
-        public static final int lmk_footer=0x7f030016;
-        public static final int lmk_layout=0x7f030017;
-        public static final int log_dialog=0x7f030018;
-        public static final int menu_glossary=0x7f030019;
-        public static final int menu_header=0x7f03001a;
-        public static final int menu_list=0x7f03001b;
-        public static final int menu_list_item=0x7f03001c;
-        public static final int menu_main_list_item=0x7f03001d;
-        public static final int preference=0x7f03001e;
-        public static final int preference_widget_seekbar=0x7f03001f;
-        public static final int seekbar_dialog=0x7f030020;
-        public static final int slidingmenumain=0x7f030021;
-        public static final int state_row=0x7f030022;
-        public static final int time_in_state=0x7f030023;
-        public static final int wallpaper_effects=0x7f030024;
-        public static final int wizard_layout=0x7f030025;
+        public static final int github_preference=0x7f030011;
+        public static final int header=0x7f030012;
+        public static final int info_preference=0x7f030013;
+        public static final int layout_list=0x7f030014;
+        public static final int layout_list_file=0x7f030015;
+        public static final int list_item=0x7f030016;
+        public static final int lmk_footer=0x7f030017;
+        public static final int lmk_layout=0x7f030018;
+        public static final int log_dialog=0x7f030019;
+        public static final int menu_glossary=0x7f03001a;
+        public static final int menu_header=0x7f03001b;
+        public static final int menu_list=0x7f03001c;
+        public static final int menu_list_item=0x7f03001d;
+        public static final int menu_main_list_item=0x7f03001e;
+        public static final int preference=0x7f03001f;
+        public static final int preference_widget_seekbar=0x7f030020;
+        public static final int seekbar_dialog=0x7f030021;
+        public static final int slidingmenumain=0x7f030022;
+        public static final int state_row=0x7f030023;
+        public static final int time_in_state=0x7f030024;
+        public static final int wallpaper_effects=0x7f030025;
+        public static final int wizard_layout=0x7f030026;
     }
     public static final class menu {
         public static final int cpu_info_menu=0x7f0d0000;
diff --git a/RootTools.jar b/libs/RootTools.jar
index fc9419c..fc9419c 100644
--- a/RootTools.jar
+++ b/libs/RootTools.jar
diff --git a/libGoogleAnalyticsServices.jar b/libs/libGoogleAnalyticsServices.jar
index b7aac9f..b7aac9f 100644
--- a/libGoogleAnalyticsServices.jar
+++ b/libs/libGoogleAnalyticsServices.jar
diff --git a/renderscript-v8.jar b/libs/renderscript-v8.jar
index 8b07b19..8b07b19 100644
--- a/renderscript-v8.jar
+++ b/libs/renderscript-v8.jar
diff --git a/res/layout/wizard_layout.xml b/res/layout/wizard_layout.xml
index d880b23..e0c6aee 100644
--- a/res/layout/wizard_layout.xml
+++ b/res/layout/wizard_layout.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@drawable/selectable_item_background"
-            android:text="Previous" />
+            android:text="@string/previous" />
 
         <Button
             android:id="@+id/next_button"
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@drawable/selectable_item_background"
-            android:text="Next" />
+            android:text="@string/next" />
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/menu/menu_main_container.xml b/res/menu/menu_main_container.xml
index 829d70c..7860cc3 100644
--- a/res/menu/menu_main_container.xml
+++ b/res/menu/menu_main_container.xml
@@ -1,4 +1,4 @@
 
     <menu xmlns:android="http://schemas.android.com/apk/res/android">
-        <item android:id="@+id/help" android:showAsAction="always" android:icon="@drawable/ic_help" android:title="Help"></item>
+        <item android:id="@+id/help" android:showAsAction="always" android:icon="@drawable/ic_help" android:title="@string/help"></item>
     </menu>
diff --git a/res/menu/menu_review.xml b/res/menu/menu_review.xml
index 95e5e3c..084a959 100644
--- a/res/menu/menu_review.xml
+++ b/res/menu/menu_review.xml
@@ -3,7 +3,7 @@
     <item
         android:id="@+id/action_edit"
         android:checkable="true"
-        android:title="Edit Mode">
+        android:title="@string/edit_mode">
     </item>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e55abdf..06f1133 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,6 +29,10 @@
     <string name="reboot">Reboot</string>
     <string name="no_backups_found">No Backups Found</string>
     <string name="backups_display">The backups you make will be displayed here</string>
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+    <string name="help">Help</string>
+    <string name="edit_mode">Edit mode</string>
 
     <!-- About -->
     <string name="title_about">About</string>
diff --git a/src/com/dsht/jazzy/JazzyViewPager.java b/src/com/dsht/jazzy/JazzyViewPager.java
index be0a80a..c288272 100644
--- a/src/com/dsht/jazzy/JazzyViewPager.java
+++ b/src/com/dsht/jazzy/JazzyViewPager.java
@@ -576,4 +576,4 @@ public class JazzyViewPager extends ViewPager {
 		return null;
 	}
 	
-}
\ No newline at end of file
+}