Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0d26bb authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Invert split action bar logic. 

The majority of Settings activities don't want split action bars, so
invert the logic to be opt-in instead of opt-out.

Bug: 7545845
Change-Id: I794f6df911dda61904e02a0f6b917ab92c846293
parent 9c79dea5

AndroidManifest.xml

+20 −21
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
            android:icon="@mipmap/ic_launcher_settings"

            android:taskAffinity=""

            android:theme="@android:style/Theme.Holo"

            android:uiOptions="splitActionBarWhenNarrow"

            android:hardwareAccelerated="true"

            android:supportsRtl="true">
@@ -122,6 +121,7 @@ 
        <!-- Top-level settings -->



        <activity android:name="Settings$WifiSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:taskAffinity=""

                android:label="@string/wifi_settings"

                android:configChanges="orientation|keyboardHidden|screenSize"
@@ -141,6 +141,7 @@ 


        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".wifi.WifiSettings"

                android:uiOptions="splitActionBarWhenNarrow"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_settings"

                android:targetActivity="Settings$WifiSettingsActivity"
@@ -153,6 +154,7 @@ 
        </activity-alias>



        <activity android:name=".wifi.WifiPickerActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings">

            <intent-filter>
@@ -163,6 +165,7 @@ 
        </activity>



        <activity android:name=".wifi.WifiSetupActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:theme="@style/setup_wizard_theme"

                android:label="@string/wifi_setup_wizard_title"

                android:icon="@drawable/empty_icon"
@@ -175,6 +178,7 @@ 
        </activity>



        <activity android:name=".wifi.WifiSettingsForSetupWizardXL"

                android:uiOptions="splitActionBarWhenNarrow"

                android:theme="@android:style/Theme.Holo.NoActionBar"

                android:screenOrientation="behind"

                android:clearTaskOnLaunch="true"
@@ -254,7 +258,6 @@ 


        <activity android:name="ApnSettings"

                android:label="@string/apn_settings"

                android:uiOptions="none"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:launchMode="singleTask">

            <intent-filter>
@@ -266,6 +269,7 @@ 
        </activity>



        <activity android:name="Settings$BluetoothSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/bluetooth_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">
@@ -284,6 +288,7 @@ 


        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".bluetooth.BluetoothSettings"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/bluetooth_settings_title"

                android:targetActivity="Settings$BluetoothSettingsActivity"

                android:exported="true"
@@ -295,6 +300,7 @@ 
        </activity-alias>



        <activity android:name=".bluetooth.DevicePickerActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:theme="@android:style/Theme.Holo.DialogWhenLarge"

                android:label="@string/device_picker"

                android:clearTaskOnLaunch="true">
@@ -306,7 +312,6 @@ 


        <activity android:name="Settings$TetherSettingsActivity"

                android:label="@string/tether_settings_title_all"

                android:uiOptions="none"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>
@@ -328,7 +333,6 @@ 
        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".TetherSettings"

                  android:label="@string/tether_settings_title_all"

                  android:uiOptions="none"

                  android:clearTaskOnLaunch="true"

                  android:exported="true"

                  android:targetActivity="Settings$TetherSettingsActivity">
@@ -343,6 +347,7 @@ 
        </activity-alias>



        <activity android:name="Settings$WifiP2pSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$WifiSettingsActivity">

            <intent-filter>
@@ -505,7 +510,6 @@ 
        <activity android:name="Settings$UserDictionarySettingsActivity"

                android:label="@string/user_dict_settings_titlebar"

                android:taskAffinity="com.android.settings"

                android:uiOptions="none"

                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -649,8 +653,7 @@ 
        <activity android:name="Settings$ManageApplicationsActivity"

                android:label="@string/applications_settings"

                android:taskAffinity=""

                android:excludeFromRecents="true"

                android:uiOptions="none">

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -767,7 +770,6 @@ 


        <activity android:name="Settings$LocationSettingsActivity"

                android:label="@string/location_settings_title"

                android:uiOptions="none"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity=""

                android:excludeFromRecents="true">
@@ -975,7 +977,6 @@ 


        <activity android:name="Settings$StorageSettingsActivity"

                android:label="@string/storage_settings_title"

                android:uiOptions="none"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings">

            <intent-filter>
@@ -1342,7 +1343,6 @@ 


        <activity android:name="Settings$PowerUsageSummaryActivity"

                android:label="@string/power_usage_summary_title"

                android:uiOptions="none"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>
@@ -1371,8 +1371,7 @@ 
        <activity android:name="Settings$AccountSyncSettingsActivity"

            android:label="@string/account_sync_settings_title"

            android:taskAffinity=""

            android:parentActivityName="Settings"

            android:uiOptions="none">

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1454,7 +1453,6 @@ 


        <activity android:name="Settings$DataUsageSummaryActivity"

                android:label="@string/data_usage_summary_title"

                android:uiOptions="none"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>
@@ -1469,6 +1467,7 @@ 
        </activity>



        <activity android:name="Settings$DreamSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/screensaver_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

src/com/android/settings/Settings.java

+22 −36
Original line number Diff line number Diff line
@@ -16,19 +16,6 @@ 


package com.android.settings;



import com.android.internal.util.ArrayUtils;

import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;

import com.android.settings.accounts.AccountSyncSettings;

import com.android.settings.accounts.AuthenticatorHelper;

import com.android.settings.accounts.ManageAccountsSettings;

import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.applications.ManageApplications;

import com.android.settings.bluetooth.BluetoothEnabler;

import com.android.settings.deviceinfo.Memory;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.vpn2.VpnSettings;

import com.android.settings.wifi.WifiEnabler;



import android.accounts.Account;

import android.accounts.AccountManager;

import android.accounts.OnAccountsUpdateListener;
@@ -62,6 +49,17 @@ import android.widget.ListAdapter; 
import android.widget.Switch;

import android.widget.TextView;



import com.android.internal.util.ArrayUtils;

import com.android.settings.AccessibilitySettings.ToggleAccessibilityServicePreferenceFragment;

import com.android.settings.accounts.AccountSyncSettings;

import com.android.settings.accounts.AuthenticatorHelper;

import com.android.settings.accounts.ManageAccountsSettings;

import com.android.settings.bluetooth.BluetoothEnabler;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.wifi.WifiEnabler;

import com.android.settings.wifi.WifiSettings;

import com.android.settings.wifi.p2p.WifiP2pSettings;



import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;
@@ -85,7 +83,7 @@ public class Settings extends PreferenceActivity 
    private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =

        "com.android.settings.PARENT_FRAGMENT_CLASS";



    private static final String EXTRA_CLEAR_UI_OPTIONS = "settings:remove_ui_options";

    private static final String EXTRA_UI_OPTIONS = "settings:ui_options";



    private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";

    private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
@@ -136,8 +134,8 @@ public class Settings extends PreferenceActivity 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) {

            getWindow().setUiOptions(0);

        if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {

            getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));

        }



        mAuthenticatorHelper = new AuthenticatorHelper();
@@ -379,26 +377,14 @@ public class Settings extends PreferenceActivity 
        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,

                titleRes, shortTitleRes);



        // some fragments want to avoid split actionbar

        if (DataUsageSummary.class.getName().equals(fragmentName) ||

                PowerUsageSummary.class.getName().equals(fragmentName) ||

                AccountSyncSettings.class.getName().equals(fragmentName) ||

                UserDictionarySettings.class.getName().equals(fragmentName) ||

                Memory.class.getName().equals(fragmentName) ||

                ManageApplications.class.getName().equals(fragmentName) ||

                WirelessSettings.class.getName().equals(fragmentName) ||

                SoundSettings.class.getName().equals(fragmentName) ||

                PrivacySettings.class.getName().equals(fragmentName) ||

                ManageAccountsSettings.class.getName().equals(fragmentName) ||

                VpnSettings.class.getName().equals(fragmentName) ||

                SecuritySettings.class.getName().equals(fragmentName) ||

                InstalledAppDetails.class.getName().equals(fragmentName) ||

                ChooseLockGenericFragment.class.getName().equals(fragmentName) ||

                TetherSettings.class.getName().equals(fragmentName) ||

                ApnSettings.class.getName().equals(fragmentName) ||

                LocationSettings.class.getName().equals(fragmentName) ||

                ZonePicker.class.getName().equals(fragmentName)) {

            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);

        // Some fragments want split ActionBar; these should stay in sync with

        // uiOptions for fragments also defined as activities in manifest.

        if (WifiSettings.class.getName().equals(fragmentName) ||

                WifiP2pSettings.class.getName().equals(fragmentName) ||

                BluetoothSettings.class.getName().equals(fragmentName) ||

                DreamSettings.class.getName().equals(fragmentName) ||

                ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) {

            intent.putExtra(EXTRA_UI_OPTIONS, ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);

        }



        intent.setClass(this, SubSettings.class);