Dev

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Android.mk

@@ -4,6 +4,9 @@ include $(CLEAR_VARS)
 LOCAL_STATIC_JAVA_LIBRARIES := libarity android-support-v4
 LOCAL_PACKAGE_NAME := Superuser
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
 LOCAL_CERTIFICATE := superuser
 

AndroidManifest.xml

@@ -16,12 +16,46 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.noshufou.android.su"
-      android:versionCode="41"
-      android:versionName="3.0.7">
+      android:versionCode="44"
+      android:versionName="3.1.2">
+
+    <uses-permission android:name="com.noshufou.android.su.RESPOND" />
+    <uses-permission android:name="com.noshufou.android.su.provider.READ" />
+    <uses-permission android:name="com.noshufou.android.su.provider.WRITE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <permission android:name="com.noshufou.android.su.RESPOND"
+        android:label="@string/permlab_respond"
+        android:description="@string/permdesc_respond"
+        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
+        android:protectionLevel="signature" />
+    <permission android:name="com.noshufou.android.su.provider.READ"
+        android:label="@string/permlab_provider_read"
+        android:description="@string/permdesc_provider_read"
+        android:permissionGroup="com.noshufou.android.su.permission-group.SUPERUSER"
+        android:protectionLevel="signature" />
+    <permission android:name="com.noshufou.android.su.provider.WRITE"
+        android:label="@string/permlab_provider_write"
+        android:description="@string/permdesc_provider_write"
+        android:permissionGroup="com.noshufou.android.su.permission-group.SUPERUSER"
+        android:protectionLevel="signature" />
+
+    <permission-group android:name="com.noshufou.android.su.permission-group.SUPERUSER"
+        android:label="@string/permgrouplab_superuser"
+        android:description="@string/permgroupdesc_superuser" />
+
+    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="11"/>
+
+    <uses-feature android:name="android.hardware.nfc" android:required="false" />
+
     <application android:label="@string/app_name"
         android:icon="@drawable/icon"
-        android:logo="@drawable/title_logo"
-        android:hardwareAccelerated="true">
+        android:logo="@drawable/ic_logo"
+        android:hardwareAccelerated="true"
+        android:debuggable="true">
         <activity android:name="HomeActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.Superuser"
@@ -36,16 +70,17 @@
             </intent-filter>
         </activity-alias>
         <activity android:name="AppDetailsActivity"
-            android:theme="@style/Theme.Superuser"
-            android:label="Details" />
+            android:theme="@style/Theme.Superuser.Details"
+            android:label="Details"
+            android:uiOptions="splitActionBarWhenNarrow" />
         <activity android:name=".preferences.PreferencesActivity"
             android:theme="@style/Theme.Superuser.Preferences"
             android:label="Preferences" />
-        <activity android:name="preferences.PreferencesActivityHC"
-            android:theme="@style/Theme.Superuser"
+        <activity android:name=".preferences.PreferencesActivityHC"
+            android:theme="@style/Theme.Superuser.Preferences"
             android:label="Preferences" />
         <activity android:name="UpdaterActivity"
-            android:theme="@style/Theme.Superuser"
+            android:theme="@style/Theme.Superuser.Preferences"
             android:label="Updater"
             android:screenOrientation="nosensor" />
         <activity android:name="SuRequestActivity"
@@ -109,44 +144,13 @@
 
         <service android:name=".service.ResultService" />
         <service android:name=".service.PermissionsDbService" />
+        <service android:name=".service.UpdaterService" />
 
         <provider android:name=".provider.PermissionsProvider"
             android:authorities="com.noshufou.android.su.provider"
             android:exported="true"
             android:readPermission="com.noshufou.android.su.provider.READ"
             android:writePermission="com.noshufou.android.su.provider.WRITE" />
     </application>
-
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="11"/>
-
-    <uses-feature android:name="android.hardware.nfc" android:required="false" />
-
-    <uses-permission android:name="com.noshufou.android.su.RESPOND" />
-    <uses-permission android:name="com.noshufou.android.su.provider.READ" />
-    <uses-permission android:name="com.noshufou.android.su.provider.WRITE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <permission-group android:name="com.noshufou.android.su.permission-group.SUPERUSER"
-        android:label="@string/permgrouplab_superuser"
-        android:description="@string/permgroupdesc_superuser" />
-
-    <permission android:name="com.noshufou.android.su.RESPOND"
-        android:label="@string/permlab_respond"
-        android:description="@string/permdesc_respond"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="signature" />
-    <permission android:name="com.noshufou.android.su.provider.READ"
-        android:label="@string/permlab_provider_read"
-        android:description="@string/permdesc_provider_read"
-        android:permissionGroup="com.noshufou.android.su.permission-group.SUPERUSER"
-        android:protectionLevel="signature" />
-    <permission android:name="com.noshufou.android.su.provider.WRITE"
-        android:label="@string/permlab_provider_write"
-        android:description="@string/permdesc_provider_write"
-        android:permissionGroup="com.noshufou.android.su.permission-group.SUPERUSER"
-        android:protectionLevel="signature" />
 
 </manifest> 

proguard.flags

@@ -0,0 +1 @@
+-keep class com.noshufou.android.su.UpdaterFragment

res/layout-land/activity_request.xml

@@ -27,7 +27,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="centerInside"
-        android:src="@drawable/icon" />
+        android:src="@drawable/icon"
+        android:contentDescription="@string/app_name_request" />
 
     <TextView android:id="@+id/title"
         android:layout_width="wrap_content"

res/layout-land/fragment_app_details.xml

@@ -17,53 +17,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical">
+    android:orientation="horizontal"
+    android:baselineAligned="false">
 
-    <LinearLayout style="@style/TitleBar">
-        <ImageButton style="@style/TitleBarAction"
-            android:id="@+id/home_button"
-            android:contentDescription="@string/description_home"
-            android:src="@drawable/ic_title_home"
-            android:onClick="goHome" />
-        <ImageView style="@style/TitleBarSeparator" />
-        <ImageView style="@style/TitleBarAction"
-            android:id="@+id/app_icon"
-            android:padding="2dp"
-            android:scaleType="centerInside" />
-        <TextView style="@style/TitleBarText"
-            android:id="@+id/app_name" />
-        <ImageButton style="@style/TitleBarAction"
-            android:id="@+id/status_icon"
-            android:scaleType="center" />
-        <ImageView style="@style/TitleBarSeparator" />
-        <ImageButton style="@style/TitleBarAction"
-            android:id="@+id/toggle_button"
-            android:src="@drawable/ic_btn_toggle" />
-
-        <ImageView style="@style/TitleBarSeparator" />
-        <ImageButton style="@style/TitleBarAction"
-            android:id="@+id/forget_button"
-            android:src="@drawable/ic_btn_delete" />
-
-        <ImageView style="@style/TitleBarSeparator" />
-        <ImageButton style="@style/TitleBarAction"
-            android:id="@+id/clear_log_button"
-            android:src="@drawable/ic_btn_clear_log" />
-
-        <ImageView style="@style/TitleBarSeparator" />
-        <ImageButton style="@style/TitleBarAction"
-            android:id="@+id/more_button"
-            android:visibility="gone"
-            android:src="@drawable/ic_btn_more" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
     <LinearLayout style="@style/AppDetailsLayout"
         android:id="@+id/details_layout"
         android:layout_width="0dp"
@@ -109,31 +65,28 @@
             <TextView style="@style/DetailsInfo"
                 android:id="@+id/status" />
         </LinearLayout>
-        </LinearLayout>
+    </LinearLayout>
 
     <LinearLayout style="@style/AppDetailsLayout"
-        android:id="@+id/details_layout"
-        android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:paddingTop="15dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
         android:layout_weight="1">
-        <LinearLayout style="@style/AppDetailsRow"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-            <TextView style="@style/DetailsLabel"
-                android:id="@+id/recent_activity_label"
-                android:text="@string/recent_activity" />
-            <TextView style="@style/DetailsInfo"
-                android:id="@android:id/empty"
-                android:text="@string/empty_logs" />
-            <com.noshufou.android.su.widget.PinnedHeaderListView
-                android:id="@android:id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="20dp"
-                android:scrollbarStyle="outsideOverlay" />
-        </LinearLayout>
-    </LinearLayout>
-
+        <TextView style="@style/DetailsLabel"
+            android:id="@+id/recent_activity_label"
+            android:text="@string/recent_activity"
+            android:background="@drawable/app_icon_header_background" />
+        <TextView style="@style/DetailsInfo"
+            android:id="@android:id/empty"
+            android:text="@string/empty_logs" />
+        <com.noshufou.android.su.widget.PinnedHeaderListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:scrollbarStyle="outsideOverlay" />
     </LinearLayout>
 
 </LinearLayout>

res/layout-large-port/activity_home.xml

@@ -20,13 +20,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout style="@style/TitleBar">
-        <ImageView android:id="@android:id/home"
-            style="@style/TitleBarLogo"
-            android:src="@drawable/title_logo" />
-
-    </LinearLayout>
-
     <com.noshufou.android.su.widget.SlidingPanel android:id="@+id/drawer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

res/layout-large/activity_home.xml

@@ -17,35 +17,24 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="horizontal"
+    android:baselineAligned="false"
+    android:paddingLeft="@dimen/home_activity_horiz_padding"
+    android:paddingRight="@dimen/home_activity_horiz_padding">
 
-    <LinearLayout style="@style/TitleBar">
-        <ImageView android:id="@android:id/home"
-            style="@style/TitleBarLogo"
-            android:src="@drawable/title_logo" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
+    <FrameLayout android:id="@+id/app_list_container"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.75"
+        android:paddingTop="24dp"
+        android:background="@drawable/left_panel_background">
+        <fragment class="com.noshufou.android.su.AppListFragment"
+            android:id="@+id/app_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </FrameLayout>
+    <FrameLayout android:id="@+id/fragment_container"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:paddingLeft="@dimen/home_activity_horiz_padding"
-        android:paddingRight="@dimen/home_activity_horiz_padding">
-        <FrameLayout android:id="@+id/app_list_container"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.75"
-            android:paddingTop="24dp"
-            android:background="@drawable/left_panel_background">
-            <fragment class="com.noshufou.android.su.AppListFragment"
-                android:id="@+id/app_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </FrameLayout>
-        <FrameLayout android:id="@+id/fragment_container"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1.25" />
-    </LinearLayout>
-</LinearLayout>
+        android:layout_weight="1.25" />
+</LinearLayout>