Commit ad1f0b47 authored by Matthew Finkel's avatar Matthew Finkel Committed by Georg Koppen
Browse files

Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission

parent 85365dc5

mobile/android/app/src/main/res/xml/preferences_general.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"

mobile/android/app/src/main/res/xml/preferences_general_tablet.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

mobile/android/base/FennecManifest_permissions.xml.in

+0 −3
Original line number Diff line number Diff line
@@ -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"/>