commit de2e1fbe5b024957ed469063bf38b8b274b4f4ba Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Fri Aug 3 21:29:47 2018 +0000
Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission --- mobile/android/app/src/main/res/xml/preferences_general.xml | 1 + mobile/android/app/src/main/res/xml/preferences_general_tablet.xml | 1 + mobile/android/base/FennecManifest_permissions.xml.in | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mobile/android/app/src/main/res/xml/preferences_general.xml b/mobile/android/app/src/main/res/xml/preferences_general.xml index f148ae61b169..ef739db0c3d8 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general.xml @@ -31,6 +31,7 @@ <SwitchPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" + android:selectable="false" android:defaultValue="false" />
<SwitchPreference android:key="android.not_a_preference.compact_tabs" diff --git a/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml b/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml index f05be98277fc..72d4e024b55f 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml @@ -37,6 +37,7 @@ <SwitchPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" + android:selectable="false" android:defaultValue="false" />
</PreferenceScreen> diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 1b7b2d5475ec..f7bfe475bece 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -46,9 +46,6 @@ #endif <uses-feature android:name="android.hardware.touchscreen"/>
- <!-- Tab Queue --> - <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> - #ifdef MOZ_ANDROID_BEAM <!-- Android Beam support --> <uses-permission android:name="android.permission.NFC"/>