diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..496ee2ca --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/Android.mk b/Android.mk index f322fee0..3826f88d 100644 --- a/Android.mk +++ b/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 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ffee3f1d..ce04b635 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,12 +16,46 @@ --> + android:versionCode="44" + android:versionName="3.1.2"> + + + + + + + + + + + + + + + + + + + + android:logo="@drawable/ic_logo" + android:hardwareAccelerated="true" + android:debuggable="true"> + android:theme="@style/Theme.Superuser.Details" + android:label="Details" + android:uiOptions="splitActionBarWhenNarrow" /> - + - - - - - - - - - - - - - - - - - - diff --git a/assets/sutools-armeabi b/assets/sutools-armeabi new file mode 100755 index 00000000..5994ad00 Binary files /dev/null and b/assets/sutools-armeabi differ diff --git a/assets/sutools-x86 b/assets/sutools-x86 new file mode 100755 index 00000000..14d67f64 Binary files /dev/null and b/assets/sutools-x86 differ diff --git a/proguard.flags b/proguard.flags new file mode 100644 index 00000000..6bcc1e19 --- /dev/null +++ b/proguard.flags @@ -0,0 +1 @@ +-keep class com.noshufou.android.su.UpdaterFragment diff --git a/res/drawable-hdpi-v11/ic_menu_clear_log.png b/res/drawable-hdpi-v11/ic_menu_clear_log.png deleted file mode 100755 index a85f0931..00000000 Binary files a/res/drawable-hdpi-v11/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable-hdpi-v11/ic_menu_preferences.png b/res/drawable-hdpi-v11/ic_menu_preferences.png deleted file mode 100755 index c60ed1b8..00000000 Binary files a/res/drawable-hdpi-v11/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable-hdpi-v11/ic_menu_star.png b/res/drawable-hdpi-v11/ic_menu_star.png deleted file mode 100755 index c32be71e..00000000 Binary files a/res/drawable-hdpi-v11/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_clear_log.png b/res/drawable-hdpi-v9/ic_menu_clear_log.png deleted file mode 100755 index 3e166bc1..00000000 Binary files a/res/drawable-hdpi-v9/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_preferences.png b/res/drawable-hdpi-v9/ic_menu_preferences.png deleted file mode 100755 index 8519fbd4..00000000 Binary files a/res/drawable-hdpi-v9/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_star.png b/res/drawable-hdpi-v9/ic_menu_star.png deleted file mode 100755 index a969ab5a..00000000 Binary files a/res/drawable-hdpi-v9/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-hdpi/bottom_bar.png b/res/drawable-hdpi/bottom_bar.png deleted file mode 100644 index 1f38f3c8..00000000 Binary files a/res/drawable-hdpi/bottom_bar.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_clear_log.png b/res/drawable-hdpi/ic_action_clear_log.png new file mode 100644 index 00000000..59097923 Binary files /dev/null and b/res/drawable-hdpi/ic_action_clear_log.png differ diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png new file mode 100644 index 00000000..5d9b03f1 Binary files /dev/null and b/res/drawable-hdpi/ic_action_delete.png differ diff --git a/res/drawable-hdpi/ic_action_extras.png b/res/drawable-hdpi/ic_action_extras.png new file mode 100644 index 00000000..0a759fcb Binary files /dev/null and b/res/drawable-hdpi/ic_action_extras.png differ diff --git a/res/drawable-hdpi/ic_action_info.png b/res/drawable-hdpi/ic_action_info.png new file mode 100644 index 00000000..3a545c77 Binary files /dev/null and b/res/drawable-hdpi/ic_action_info.png differ diff --git a/res/drawable-hdpi/ic_action_log.png b/res/drawable-hdpi/ic_action_log.png new file mode 100755 index 00000000..b0a89db8 Binary files /dev/null and b/res/drawable-hdpi/ic_action_log.png differ diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 00000000..05a3188e Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings.png differ diff --git a/res/drawable-hdpi/ic_action_toggle.png b/res/drawable-hdpi/ic_action_toggle.png new file mode 100644 index 00000000..255549ed Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle.png differ diff --git a/res/drawable-hdpi/ic_btn_clear_log.png b/res/drawable-hdpi/ic_btn_clear_log.png deleted file mode 100644 index 2b618117..00000000 Binary files a/res/drawable-hdpi/ic_btn_clear_log.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_btn_delete.png b/res/drawable-hdpi/ic_btn_delete.png deleted file mode 100644 index 637e3898..00000000 Binary files a/res/drawable-hdpi/ic_btn_delete.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_btn_more.png b/res/drawable-hdpi/ic_btn_more.png deleted file mode 100644 index 84741dd9..00000000 Binary files a/res/drawable-hdpi/ic_btn_more.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_btn_toggle.png b/res/drawable-hdpi/ic_btn_toggle.png deleted file mode 100644 index 47b3201c..00000000 Binary files a/res/drawable-hdpi/ic_btn_toggle.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_clear_log.png b/res/drawable-hdpi/ic_menu_clear_log.png deleted file mode 100755 index 0c3e06d9..00000000 Binary files a/res/drawable-hdpi/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_preferences.png b/res/drawable-hdpi/ic_menu_preferences.png deleted file mode 100755 index 98e3d195..00000000 Binary files a/res/drawable-hdpi/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_star.png b/res/drawable-hdpi/ic_menu_star.png deleted file mode 100755 index c08587d2..00000000 Binary files a/res/drawable-hdpi/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-hdpi/perm_allow_dot.png b/res/drawable-hdpi/perm_allow_dot.png index 22ed8277..76944469 100644 Binary files a/res/drawable-hdpi/perm_allow_dot.png and b/res/drawable-hdpi/perm_allow_dot.png differ diff --git a/res/drawable-hdpi/perm_allow_emo.png b/res/drawable-hdpi/perm_allow_emo.png index 0bff1763..f1e47237 100644 Binary files a/res/drawable-hdpi/perm_allow_emo.png and b/res/drawable-hdpi/perm_allow_emo.png differ diff --git a/res/drawable-hdpi/perm_deny_dot.png b/res/drawable-hdpi/perm_deny_dot.png index fbb0b6e1..391d1c98 100644 Binary files a/res/drawable-hdpi/perm_deny_dot.png and b/res/drawable-hdpi/perm_deny_dot.png differ diff --git a/res/drawable-hdpi/perm_deny_emo.png b/res/drawable-hdpi/perm_deny_emo.png index 1141cf30..bcfe71b4 100644 Binary files a/res/drawable-hdpi/perm_deny_emo.png and b/res/drawable-hdpi/perm_deny_emo.png differ diff --git a/res/drawable-land/dialog_background.9.png b/res/drawable-land-mdpi/dialog_background.9.png similarity index 100% rename from res/drawable-land/dialog_background.9.png rename to res/drawable-land-mdpi/dialog_background.9.png diff --git a/res/drawable-large-land/panel_content.9.png b/res/drawable-large-land/panel_content.9.png index 1faa93ab..f5647a67 100644 Binary files a/res/drawable-large-land/panel_content.9.png and b/res/drawable-large-land/panel_content.9.png differ diff --git a/res/drawable-large/ic_btn_clear_log.png b/res/drawable-large/ic_btn_clear_log.png deleted file mode 100644 index e601cf2e..00000000 Binary files a/res/drawable-large/ic_btn_clear_log.png and /dev/null differ diff --git a/res/drawable-large/ic_btn_close.png b/res/drawable-large/ic_btn_close.png deleted file mode 100644 index 06673a5d..00000000 Binary files a/res/drawable-large/ic_btn_close.png and /dev/null differ diff --git a/res/drawable-large/ic_btn_delete.png b/res/drawable-large/ic_btn_delete.png deleted file mode 100644 index 57422a00..00000000 Binary files a/res/drawable-large/ic_btn_delete.png and /dev/null differ diff --git a/res/drawable-large/ic_btn_more.png b/res/drawable-large/ic_btn_more.png deleted file mode 100644 index 7eb2e17c..00000000 Binary files a/res/drawable-large/ic_btn_more.png and /dev/null differ diff --git a/res/drawable-large/ic_btn_preferences.png b/res/drawable-large/ic_btn_preferences.png deleted file mode 100644 index f6994472..00000000 Binary files a/res/drawable-large/ic_btn_preferences.png and /dev/null differ diff --git a/res/drawable-large/ic_btn_star.png b/res/drawable-large/ic_btn_star.png deleted file mode 100644 index 859a1cc1..00000000 Binary files a/res/drawable-large/ic_btn_star.png and /dev/null differ diff --git a/res/drawable-large/ic_btn_toggle.png b/res/drawable-large/ic_btn_toggle.png deleted file mode 100644 index 7e0181b9..00000000 Binary files a/res/drawable-large/ic_btn_toggle.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_clear_log.png b/res/drawable-ldpi-v9/ic_menu_clear_log.png deleted file mode 100755 index 98866767..00000000 Binary files a/res/drawable-ldpi-v9/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_preferences.png b/res/drawable-ldpi-v9/ic_menu_preferences.png deleted file mode 100755 index ea8a7a42..00000000 Binary files a/res/drawable-ldpi-v9/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_star.png b/res/drawable-ldpi-v9/ic_menu_star.png deleted file mode 100755 index 791defaa..00000000 Binary files a/res/drawable-ldpi-v9/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_clear_log.png b/res/drawable-ldpi/ic_action_clear_log.png new file mode 100644 index 00000000..c54e5bf0 Binary files /dev/null and b/res/drawable-ldpi/ic_action_clear_log.png differ diff --git a/res/drawable-ldpi/ic_action_delete.png b/res/drawable-ldpi/ic_action_delete.png new file mode 100644 index 00000000..dd8d7785 Binary files /dev/null and b/res/drawable-ldpi/ic_action_delete.png differ diff --git a/res/drawable-ldpi/ic_action_extras.png b/res/drawable-ldpi/ic_action_extras.png new file mode 100644 index 00000000..2001b99d Binary files /dev/null and b/res/drawable-ldpi/ic_action_extras.png differ diff --git a/res/drawable-ldpi/ic_action_info.png b/res/drawable-ldpi/ic_action_info.png new file mode 100644 index 00000000..3d953db2 Binary files /dev/null and b/res/drawable-ldpi/ic_action_info.png differ diff --git a/res/drawable-ldpi/ic_action_log.png b/res/drawable-ldpi/ic_action_log.png new file mode 100755 index 00000000..26cab875 Binary files /dev/null and b/res/drawable-ldpi/ic_action_log.png differ diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png new file mode 100644 index 00000000..ea7883c9 Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings.png differ diff --git a/res/drawable-ldpi/ic_action_toggle.png b/res/drawable-ldpi/ic_action_toggle.png new file mode 100644 index 00000000..51ba06a1 Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle.png differ diff --git a/res/drawable-ldpi/ic_menu_star.png b/res/drawable-ldpi/ic_menu_star.png deleted file mode 100644 index b88f0107..00000000 Binary files a/res/drawable-ldpi/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-v11/stat_su.png b/res/drawable-mdpi-v11/stat_su.png similarity index 100% rename from res/drawable-v11/stat_su.png rename to res/drawable-mdpi-v11/stat_su.png diff --git a/res/drawable-v9/stat_su.png b/res/drawable-mdpi-v9/stat_su.png similarity index 100% rename from res/drawable-v9/stat_su.png rename to res/drawable-mdpi-v9/stat_su.png diff --git a/res/drawable/app_icon_background.png b/res/drawable-mdpi/app_icon_background.png similarity index 100% rename from res/drawable/app_icon_background.png rename to res/drawable-mdpi/app_icon_background.png diff --git a/res/drawable/app_list_header.9.png b/res/drawable-mdpi/app_list_header.9.png similarity index 100% rename from res/drawable/app_list_header.9.png rename to res/drawable-mdpi/app_list_header.9.png diff --git a/res/drawable/dialog_background.9.png b/res/drawable-mdpi/dialog_background.9.png similarity index 100% rename from res/drawable/dialog_background.9.png rename to res/drawable-mdpi/dialog_background.9.png diff --git a/res/drawable/dialog_divider.9.png b/res/drawable-mdpi/dialog_divider.9.png similarity index 100% rename from res/drawable/dialog_divider.9.png rename to res/drawable-mdpi/dialog_divider.9.png diff --git a/res/drawable/expand_button_pressed.9.png b/res/drawable-mdpi/expand_button_pressed.9.png similarity index 100% rename from res/drawable/expand_button_pressed.9.png rename to res/drawable-mdpi/expand_button_pressed.9.png diff --git a/res/drawable-mdpi/ic_action_clear_log.png b/res/drawable-mdpi/ic_action_clear_log.png new file mode 100644 index 00000000..b70b3a89 Binary files /dev/null and b/res/drawable-mdpi/ic_action_clear_log.png differ diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png new file mode 100644 index 00000000..ffdc2694 Binary files /dev/null and b/res/drawable-mdpi/ic_action_delete.png differ diff --git a/res/drawable-mdpi/ic_action_extras.png b/res/drawable-mdpi/ic_action_extras.png new file mode 100644 index 00000000..dd124a31 Binary files /dev/null and b/res/drawable-mdpi/ic_action_extras.png differ diff --git a/res/drawable-mdpi/ic_action_info.png b/res/drawable-mdpi/ic_action_info.png new file mode 100644 index 00000000..3a503e12 Binary files /dev/null and b/res/drawable-mdpi/ic_action_info.png differ diff --git a/res/drawable-mdpi/ic_action_log.png b/res/drawable-mdpi/ic_action_log.png new file mode 100755 index 00000000..d21b37ea Binary files /dev/null and b/res/drawable-mdpi/ic_action_log.png differ diff --git a/res/drawable-mdpi/ic_action_settings.png b/res/drawable-mdpi/ic_action_settings.png new file mode 100644 index 00000000..60a73a05 Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings.png differ diff --git a/res/drawable-mdpi/ic_action_toggle.png b/res/drawable-mdpi/ic_action_toggle.png new file mode 100644 index 00000000..65667bff Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle.png differ diff --git a/res/drawable/ic_logo.png b/res/drawable-mdpi/ic_logo.png similarity index 100% rename from res/drawable/ic_logo.png rename to res/drawable-mdpi/ic_logo.png diff --git a/res/drawable/ic_logo_elite.png b/res/drawable-mdpi/ic_logo_elite.png similarity index 100% rename from res/drawable/ic_logo_elite.png rename to res/drawable-mdpi/ic_logo_elite.png diff --git a/res/drawable/icon.png b/res/drawable-mdpi/icon.png similarity index 100% rename from res/drawable/icon.png rename to res/drawable-mdpi/icon.png diff --git a/res/drawable/left_panel_background.9.png b/res/drawable-mdpi/left_panel_background.9.png similarity index 100% rename from res/drawable/left_panel_background.9.png rename to res/drawable-mdpi/left_panel_background.9.png diff --git a/res/drawable/light_header.9.png b/res/drawable-mdpi/light_header.9.png similarity index 100% rename from res/drawable/light_header.9.png rename to res/drawable-mdpi/light_header.9.png diff --git a/res/drawable/list_activated.9.png b/res/drawable-mdpi/list_activated.9.png similarity index 100% rename from res/drawable/list_activated.9.png rename to res/drawable-mdpi/list_activated.9.png diff --git a/res/drawable/list_pressed_tab.9.png b/res/drawable-mdpi/list_pressed_tab.9.png similarity index 100% rename from res/drawable/list_pressed_tab.9.png rename to res/drawable-mdpi/list_pressed_tab.9.png diff --git a/res/drawable/options_button_pressed.9.png b/res/drawable-mdpi/options_button_pressed.9.png similarity index 100% rename from res/drawable/options_button_pressed.9.png rename to res/drawable-mdpi/options_button_pressed.9.png diff --git a/res/drawable/panel_content.9.png b/res/drawable-mdpi/panel_content.9.png similarity index 100% rename from res/drawable/panel_content.9.png rename to res/drawable-mdpi/panel_content.9.png diff --git a/res/drawable-mdpi/perm_allow_dot.png b/res/drawable-mdpi/perm_allow_dot.png new file mode 100644 index 00000000..e16ec810 Binary files /dev/null and b/res/drawable-mdpi/perm_allow_dot.png differ diff --git a/res/drawable-mdpi/perm_allow_emo.png b/res/drawable-mdpi/perm_allow_emo.png new file mode 100644 index 00000000..a3247209 Binary files /dev/null and b/res/drawable-mdpi/perm_allow_emo.png differ diff --git a/res/drawable-mdpi/perm_deny_dot.png b/res/drawable-mdpi/perm_deny_dot.png new file mode 100644 index 00000000..6def8769 Binary files /dev/null and b/res/drawable-mdpi/perm_deny_dot.png differ diff --git a/res/drawable-mdpi/perm_deny_emo.png b/res/drawable-mdpi/perm_deny_emo.png new file mode 100644 index 00000000..7daac6c0 Binary files /dev/null and b/res/drawable-mdpi/perm_deny_emo.png differ diff --git a/res/drawable/popup_background.9.png b/res/drawable-mdpi/popup_background.9.png similarity index 100% rename from res/drawable/popup_background.9.png rename to res/drawable-mdpi/popup_background.9.png diff --git a/res/drawable/recent_list_header.9.png b/res/drawable-mdpi/recent_list_header.9.png similarity index 100% rename from res/drawable/recent_list_header.9.png rename to res/drawable-mdpi/recent_list_header.9.png diff --git a/res/drawable/right_panel_background.9.png b/res/drawable-mdpi/right_panel_background.9.png similarity index 100% rename from res/drawable/right_panel_background.9.png rename to res/drawable-mdpi/right_panel_background.9.png diff --git a/res/drawable/stat_su.png b/res/drawable-mdpi/stat_su.png similarity index 100% rename from res/drawable/stat_su.png rename to res/drawable-mdpi/stat_su.png diff --git a/res/drawable/sym_def_app_icon.png b/res/drawable-mdpi/sym_def_app_icon.png similarity index 100% rename from res/drawable/sym_def_app_icon.png rename to res/drawable-mdpi/sym_def_app_icon.png diff --git a/res/drawable/timepicker_down_disabled.9.png b/res/drawable-mdpi/timepicker_down_disabled.9.png similarity index 100% rename from res/drawable/timepicker_down_disabled.9.png rename to res/drawable-mdpi/timepicker_down_disabled.9.png diff --git a/res/drawable/timepicker_down_disabled_focused.9.png b/res/drawable-mdpi/timepicker_down_disabled_focused.9.png similarity index 100% rename from res/drawable/timepicker_down_disabled_focused.9.png rename to res/drawable-mdpi/timepicker_down_disabled_focused.9.png diff --git a/res/drawable/timepicker_down_normal.9.png b/res/drawable-mdpi/timepicker_down_normal.9.png similarity index 100% rename from res/drawable/timepicker_down_normal.9.png rename to res/drawable-mdpi/timepicker_down_normal.9.png diff --git a/res/drawable/timepicker_down_pressed.9.png b/res/drawable-mdpi/timepicker_down_pressed.9.png similarity index 100% rename from res/drawable/timepicker_down_pressed.9.png rename to res/drawable-mdpi/timepicker_down_pressed.9.png diff --git a/res/drawable/timepicker_down_selected.9.png b/res/drawable-mdpi/timepicker_down_selected.9.png similarity index 100% rename from res/drawable/timepicker_down_selected.9.png rename to res/drawable-mdpi/timepicker_down_selected.9.png diff --git a/res/drawable/timepicker_input_disabled.9.png b/res/drawable-mdpi/timepicker_input_disabled.9.png similarity index 100% rename from res/drawable/timepicker_input_disabled.9.png rename to res/drawable-mdpi/timepicker_input_disabled.9.png diff --git a/res/drawable/timepicker_input_normal.9.png b/res/drawable-mdpi/timepicker_input_normal.9.png similarity index 100% rename from res/drawable/timepicker_input_normal.9.png rename to res/drawable-mdpi/timepicker_input_normal.9.png diff --git a/res/drawable/timepicker_input_pressed.9.png b/res/drawable-mdpi/timepicker_input_pressed.9.png similarity index 100% rename from res/drawable/timepicker_input_pressed.9.png rename to res/drawable-mdpi/timepicker_input_pressed.9.png diff --git a/res/drawable/timepicker_input_selected.9.png b/res/drawable-mdpi/timepicker_input_selected.9.png similarity index 100% rename from res/drawable/timepicker_input_selected.9.png rename to res/drawable-mdpi/timepicker_input_selected.9.png diff --git a/res/drawable/timepicker_up_disabled.9.png b/res/drawable-mdpi/timepicker_up_disabled.9.png similarity index 100% rename from res/drawable/timepicker_up_disabled.9.png rename to res/drawable-mdpi/timepicker_up_disabled.9.png diff --git a/res/drawable/timepicker_up_disabled_focused.9.png b/res/drawable-mdpi/timepicker_up_disabled_focused.9.png similarity index 100% rename from res/drawable/timepicker_up_disabled_focused.9.png rename to res/drawable-mdpi/timepicker_up_disabled_focused.9.png diff --git a/res/drawable/timepicker_up_normal.9.png b/res/drawable-mdpi/timepicker_up_normal.9.png similarity index 100% rename from res/drawable/timepicker_up_normal.9.png rename to res/drawable-mdpi/timepicker_up_normal.9.png diff --git a/res/drawable/timepicker_up_pressed.9.png b/res/drawable-mdpi/timepicker_up_pressed.9.png similarity index 100% rename from res/drawable/timepicker_up_pressed.9.png rename to res/drawable-mdpi/timepicker_up_pressed.9.png diff --git a/res/drawable/timepicker_up_selected.9.png b/res/drawable-mdpi/timepicker_up_selected.9.png similarity index 100% rename from res/drawable/timepicker_up_selected.9.png rename to res/drawable-mdpi/timepicker_up_selected.9.png diff --git a/res/drawable/app_icon_header_background.9.png b/res/drawable-nodpi/app_icon_header_background.9.png similarity index 100% rename from res/drawable/app_icon_header_background.9.png rename to res/drawable-nodpi/app_icon_header_background.9.png diff --git a/res/drawable/app_list_divider.9.png b/res/drawable-nodpi/app_list_divider.9.png similarity index 100% rename from res/drawable/app_list_divider.9.png rename to res/drawable-nodpi/app_list_divider.9.png diff --git a/res/drawable/list_header_top.9.png b/res/drawable-nodpi/list_header_top.9.png similarity index 100% rename from res/drawable/list_header_top.9.png rename to res/drawable-nodpi/list_header_top.9.png diff --git a/res/drawable/options_button_normal.9.png b/res/drawable-nodpi/options_button_normal.9.png similarity index 100% rename from res/drawable/options_button_normal.9.png rename to res/drawable-nodpi/options_button_normal.9.png diff --git a/res/drawable/options_divider.9.png b/res/drawable-nodpi/options_divider.9.png similarity index 100% rename from res/drawable/options_divider.9.png rename to res/drawable-nodpi/options_divider.9.png diff --git a/res/drawable-v11/ic_menu_clear_log.png b/res/drawable-v11/ic_menu_clear_log.png deleted file mode 100755 index e601cf2e..00000000 Binary files a/res/drawable-v11/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable-v11/ic_menu_preferences.png b/res/drawable-v11/ic_menu_preferences.png deleted file mode 100755 index f6994472..00000000 Binary files a/res/drawable-v11/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable-v11/ic_menu_star.png b/res/drawable-v11/ic_menu_star.png deleted file mode 100755 index 859a1cc1..00000000 Binary files a/res/drawable-v11/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-v9/ic_menu_clear_log.png b/res/drawable-v9/ic_menu_clear_log.png deleted file mode 100755 index 3bf68f76..00000000 Binary files a/res/drawable-v9/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable-v9/ic_menu_preferences.png b/res/drawable-v9/ic_menu_preferences.png deleted file mode 100755 index 10e9f0aa..00000000 Binary files a/res/drawable-v9/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable-v9/ic_menu_star.png b/res/drawable-v9/ic_menu_star.png deleted file mode 100755 index 09d5d137..00000000 Binary files a/res/drawable-v9/ic_menu_star.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_clear_log.png b/res/drawable-xhdpi/ic_action_clear_log.png new file mode 100644 index 00000000..447333a0 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_clear_log.png differ diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png new file mode 100644 index 00000000..d8f80ea4 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_delete.png differ diff --git a/res/drawable-xhdpi/ic_action_extras.png b/res/drawable-xhdpi/ic_action_extras.png new file mode 100644 index 00000000..a627e48d Binary files /dev/null and b/res/drawable-xhdpi/ic_action_extras.png differ diff --git a/res/drawable-xhdpi/ic_action_info.png b/res/drawable-xhdpi/ic_action_info.png new file mode 100644 index 00000000..42c058ab Binary files /dev/null and b/res/drawable-xhdpi/ic_action_info.png differ diff --git a/res/drawable-xhdpi/ic_action_log.png b/res/drawable-xhdpi/ic_action_log.png new file mode 100755 index 00000000..1027d4bb Binary files /dev/null and b/res/drawable-xhdpi/ic_action_log.png differ diff --git a/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 00000000..c12fd53a Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/res/drawable-xhdpi/ic_action_toggle.png b/res/drawable-xhdpi/ic_action_toggle.png new file mode 100644 index 00000000..82061e96 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle.png differ diff --git a/res/drawable-xhdpi/perm_allow_dot.png b/res/drawable-xhdpi/perm_allow_dot.png new file mode 100644 index 00000000..e2aef117 Binary files /dev/null and b/res/drawable-xhdpi/perm_allow_dot.png differ diff --git a/res/drawable-xhdpi/perm_allow_emo.png b/res/drawable-xhdpi/perm_allow_emo.png new file mode 100644 index 00000000..a2702b26 Binary files /dev/null and b/res/drawable-xhdpi/perm_allow_emo.png differ diff --git a/res/drawable-xhdpi/perm_deny_dot.png b/res/drawable-xhdpi/perm_deny_dot.png new file mode 100644 index 00000000..8278ce2b Binary files /dev/null and b/res/drawable-xhdpi/perm_deny_dot.png differ diff --git a/res/drawable-xhdpi/perm_deny_emo.png b/res/drawable-xhdpi/perm_deny_emo.png new file mode 100644 index 00000000..81e94b1e Binary files /dev/null and b/res/drawable-xhdpi/perm_deny_emo.png differ diff --git a/res/drawable/divider_horizontal_bright_opaque.9.png b/res/drawable/divider_horizontal_bright_opaque.9.png deleted file mode 100644 index 10d8f17e..00000000 Binary files a/res/drawable/divider_horizontal_bright_opaque.9.png and /dev/null differ diff --git a/res/drawable/ic_menu_clear_log.png b/res/drawable/ic_menu_clear_log.png deleted file mode 100755 index 27926452..00000000 Binary files a/res/drawable/ic_menu_clear_log.png and /dev/null differ diff --git a/res/drawable/ic_menu_preferences.png b/res/drawable/ic_menu_preferences.png deleted file mode 100755 index d292c623..00000000 Binary files a/res/drawable/ic_menu_preferences.png and /dev/null differ diff --git a/res/drawable/ic_menu_star.png b/res/drawable/ic_menu_star.png deleted file mode 100755 index 8781250a..00000000 Binary files a/res/drawable/ic_menu_star.png and /dev/null differ diff --git a/res/drawable/perm_allow_dot.png b/res/drawable/perm_allow_dot.png deleted file mode 100644 index 22d5683e..00000000 Binary files a/res/drawable/perm_allow_dot.png and /dev/null differ diff --git a/res/drawable/perm_allow_emo.png b/res/drawable/perm_allow_emo.png deleted file mode 100644 index b86602ae..00000000 Binary files a/res/drawable/perm_allow_emo.png and /dev/null differ diff --git a/res/drawable/perm_deny_dot.png b/res/drawable/perm_deny_dot.png deleted file mode 100644 index 9d7620b1..00000000 Binary files a/res/drawable/perm_deny_dot.png and /dev/null differ diff --git a/res/drawable/perm_deny_emo.png b/res/drawable/perm_deny_emo.png deleted file mode 100644 index 31c08d06..00000000 Binary files a/res/drawable/perm_deny_emo.png and /dev/null differ diff --git a/res/layout-land/activity_request.xml b/res/layout-land/activity_request.xml index 8f9031a8..9ce34c97 100644 --- a/res/layout-land/activity_request.xml +++ b/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" /> + android:orientation="horizontal" + android:baselineAligned="false"> - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + + \ No newline at end of file diff --git a/res/layout-large-port/activity_home.xml b/res/layout-large-port/activity_home.xml index 478c6abf..4c1876ef 100644 --- a/res/layout-large-port/activity_home.xml +++ b/res/layout-large-port/activity_home.xml @@ -20,13 +20,6 @@ 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"> - - - - - - + + + - - - - - - + android:layout_weight="1.25" /> + \ No newline at end of file diff --git a/res/layout-large/fragment_app_details.xml b/res/layout-large/fragment_app_details.xml index 65869a8c..961c0883 100644 --- a/res/layout-large/fragment_app_details.xml +++ b/res/layout-large/fragment_app_details.xml @@ -17,48 +17,43 @@ - - + + - - - - - - + + android:layout_weight="1" + android:gravity="center_vertical" + android:paddingLeft="20dp" + android:text="@string/loading" /> + + + + - - - - - - - - - diff --git a/res/layout-large/fragment_log.xml b/res/layout-large/fragment_log.xml index 9ff75431..81a43296 100644 --- a/res/layout-large/fragment_log.xml +++ b/res/layout-large/fragment_log.xml @@ -17,38 +17,21 @@ - - - - - - - - - - \ No newline at end of file + android:paddingLeft="20dp" + android:paddingTop="20dp" + android:paddingRight="20dp" + android:orientation="vertical" + android:background="@drawable/panel_content"> + + + + diff --git a/res/layout-port/activity_request.xml b/res/layout-port/activity_request.xml index 9044ba70..4d45876c 100644 --- a/res/layout-port/activity_request.xml +++ b/res/layout-port/activity_request.xml @@ -27,7 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="centerInside" - android:src="@drawable/icon" /> + android:src="@drawable/icon" + android:contentDescription="@string/app_name_request" /> + android:orientation="vertical"> - - - - - - - - - - - - - - + - - + \ No newline at end of file diff --git a/res/layout/number_picker.xml b/res/layout/ancient_number_picker.xml similarity index 87% rename from res/layout/number_picker.xml rename to res/layout/ancient_number_picker.xml index 6dab1c74..43d58875 100644 --- a/res/layout/number_picker.xml +++ b/res/layout/ancient_number_picker.xml @@ -19,7 +19,7 @@ - @@ -29,12 +29,13 @@ android:layout_height="wrap_content" android:gravity="center" android:singleLine="true" + android:inputType="number" style="?android:attr/textAppearanceLargeInverse" android:textColor="@android:color/primary_text_light" android:textSize="30sp" android:background="@drawable/timepicker_input" /> - diff --git a/res/layout/activity_log.xml b/res/layout/ancient_number_picker_dialog.xml similarity index 56% rename from res/layout/activity_log.xml rename to res/layout/ancient_number_picker_dialog.xml index 318c66b1..e70636b1 100644 --- a/res/layout/activity_log.xml +++ b/res/layout/ancient_number_picker_dialog.xml @@ -1,6 +1,7 @@ + + android:layout_height="wrap_content" > - + - + + + \ No newline at end of file diff --git a/res/layout/console_item.xml b/res/layout/console_item.xml index d8fea847..bc6d37f3 100644 --- a/res/layout/console_item.xml +++ b/res/layout/console_item.xml @@ -19,5 +19,5 @@ android:layout_height="wrap_content" android:typeface="monospace" android:textSize="@dimen/text_size_console" - android:textColor="@color/console_grey" + android:textColor="#eeeeec" android:bufferType="spannable" /> \ No newline at end of file diff --git a/res/layout/dialog_malicious_apps.xml b/res/layout/dialog_malicious_apps.xml index e9b7e565..85362031 100644 --- a/res/layout/dialog_malicious_apps.xml +++ b/res/layout/dialog_malicious_apps.xml @@ -32,7 +32,7 @@ diff --git a/res/layout/fragment_app_details.xml b/res/layout/fragment_app_details.xml index 291cc2fa..a2ce2936 100644 --- a/res/layout/fragment_app_details.xml +++ b/res/layout/fragment_app_details.xml @@ -15,124 +15,68 @@ limitations under the License. --> - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - + + + - - + + + + + - - - - - - - - - - - - - + android:layout_weight="1"> + + + \ No newline at end of file diff --git a/res/layout/fragment_info.xml b/res/layout/fragment_info.xml new file mode 100644 index 00000000..48910568 --- /dev/null +++ b/res/layout/fragment_info.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/fragment_updater.xml b/res/layout/fragment_updater.xml index 09e4cfa7..14862aa6 100644 --- a/res/layout/fragment_updater.xml +++ b/res/layout/fragment_updater.xml @@ -14,81 +14,37 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - + android:orientation="vertical" + android:paddingLeft="@dimen/pref_side_padding" + android:paddingRight="@dimen/pref_side_padding" + android:gravity="center_horizontal" > - - - - -