aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Cruz <mazda@UnicornBox.(none)>2014-03-04 18:14:56 -0600
committerLorDClockaN <davor@losinj.com>2014-03-16 15:54:44 +0100
commit73bb376bd29f432a942fcb262498fb36d393eeba (patch)
treeb68f96305a38bbf2e269fcf28a7d347a62a6b338
parent19f3e63ada4e3fd8fc06485d81c803e47eb60ff2 (diff)
Fixed up Android.mk for libs, get things inline to compile with any ROM :-)
Change-Id: I03d6f3386b05a4a3805916c598c7be0fcd8e7922
-rw-r--r--Android.mk3
-rw-r--r--AndroidManifest.xml2
-rw-r--r--RootTools.jar (renamed from libs/RootTools-3.3.jar)bin71434 -> 71434 bytes
-rw-r--r--android-support-v4.jar (renamed from libs/android-support-v4.jar)bin627582 -> 627582 bytes
-rw-r--r--libGoogleAnalyticsServices.jar (renamed from libs/libGoogleAnalyticsServices.jar)bin900349 -> 900349 bytes
-rw-r--r--renderscript-v8.jar (renamed from libs/renderscript-v8.jar)bin131608 -> 131608 bytes
-rw-r--r--res/layout/slidingmenumain.xml5
-rw-r--r--res/values/attrs.xml28
-rw-r--r--res/values/ids.xml5
-rw-r--r--src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java1
-rw-r--r--src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java1
-rw-r--r--src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java2
12 files changed, 43 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 6e96e8e..3c0178e 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
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 roottools renderscript google
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -14,6 +14,7 @@ include $(BUILD_PACKAGE)
##################################################
include $(CLEAR_VARS)
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := roottools:RootTools.jar renderscript:renderscript-v8.jar google:libGoogleAnalyticsServices.jar
include $(BUILD_MULTI_PREBUILT)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9cec671..40178db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,4 +44,4 @@
</receiver>
</application>
-</manifest> \ No newline at end of file
+</manifest>
diff --git a/libs/RootTools-3.3.jar b/RootTools.jar
index fc9419c..fc9419c 100644
--- a/libs/RootTools-3.3.jar
+++ b/RootTools.jar
Binary files differ
diff --git a/libs/android-support-v4.jar b/android-support-v4.jar
index 96644ed..96644ed 100644
--- a/libs/android-support-v4.jar
+++ b/android-support-v4.jar
Binary files differ
diff --git a/libs/libGoogleAnalyticsServices.jar b/libGoogleAnalyticsServices.jar
index b7aac9f..b7aac9f 100644
--- a/libs/libGoogleAnalyticsServices.jar
+++ b/libGoogleAnalyticsServices.jar
Binary files differ
diff --git a/libs/renderscript-v8.jar b/renderscript-v8.jar
index 8b07b19..8b07b19 100644
--- a/libs/renderscript-v8.jar
+++ b/renderscript-v8.jar
Binary files differ
diff --git a/res/layout/slidingmenumain.xml b/res/layout/slidingmenumain.xml
new file mode 100644
index 0000000..5cdbbf5
--- /dev/null
+++ b/res/layout/slidingmenumain.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.jeremyfeinstein.slidingmenu.lib.SlidingMenu xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingmenumain"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" /> \ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 877e09c..c822494 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -5,6 +5,7 @@
<attr name="cb_color" format="color" />
<attr name="cb_pressed_ring_width" format="dimension" />
</declare-styleable>
+
<declare-styleable name="InfoPreference">
<attr name="image" format="reference" />
<attr name="button1_text" format="reference" />
@@ -35,4 +36,29 @@
<attr name="outlineColor" format="color|reference" />
</declare-styleable>
-</resources> \ No newline at end of file
+ <declare-styleable name="SlidingMenu">
+ <attr name="mode">
+ <enum name="left" value="0" />
+ <enum name="right" value="1" />
+ </attr>
+ <attr name="viewAbove" format="reference" />
+ <attr name="viewBehind" format="reference" />
+ <attr name="behindOffset" format="dimension" />
+ <attr name="behindWidth" format="dimension" />
+ <attr name="behindScrollScale" format="float" />
+ <attr name="touchModeAbove">
+ <enum name="margin" value="0" />
+ <enum name="fullscreen" value="1" />
+ </attr>
+ <attr name="touchModeBehind">
+ <enum name="margin" value="0" />
+ <enum name="fullscreen" value="1" />
+ </attr>
+ <attr name="shadowDrawable" format="reference" />
+ <attr name="shadowWidth" format="dimension" />
+ <attr name="fadeEnabled" format="boolean" />
+ <attr name="fadeDegree" format="float" />
+ <attr name="selectorEnabled" format="boolean" />
+ <attr name="selectorDrawable" format="reference" />
+ </declare-styleable>
+</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
new file mode 100644
index 0000000..eac70c9
--- /dev/null
+++ b/res/values/ids.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <item name="selected_view" type="id"/>
+
+</resources> \ No newline at end of file
diff --git a/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java b/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java
index fa0544d..ffde2e5 100644
--- a/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java
+++ b/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java
@@ -13,6 +13,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import com.dsht.kerneltweaker.R;
import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer;
public class CustomViewBehind extends ViewGroup {
diff --git a/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java
index 8b88708..578bd1d 100644
--- a/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java
+++ b/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java
@@ -27,6 +27,7 @@ import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
+import com.dsht.kerneltweaker.R;
import com.jeremyfeinstein.slidingmenu.lib.CustomViewAbove.OnPageChangeListener;
public class SlidingMenu extends RelativeLayout {
diff --git a/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java b/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java
index 0cf954b..27f2dd2 100644
--- a/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java
+++ b/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java
@@ -8,7 +8,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
-import com.jeremyfeinstein.slidingmenu.lib.R;
+import com.dsht.kerneltweaker.R;
import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;
public class SlidingActivityHelper {