PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invert split action bar logic.

Browse Source 
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
This commit is contained in:
Jeff Sharkey
2012-11-27 16:42:27 -08:00
parent 9c79dea53d
commit cc0d26bb14
2 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
AndroidManifest.xml
View File

@@ -67,7 +67,6 @@
android:icon="@mipmap/ic_launcher_settings" android:icon="@mipmap/ic_launcher_settings"
android:taskAffinity="" android:taskAffinity=""
android:theme="@android:style/Theme.Holo" android:theme="@android:style/Theme.Holo"
android:uiOptions="splitActionBarWhenNarrow"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:supportsRtl="true"> android:supportsRtl="true">
@@ -122,6 +121,7 @@
<!-- Top-level settings --> <!-- Top-level settings -->
<activity android:name="Settings$WifiSettingsActivity" <activity android:name="Settings$WifiSettingsActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity="" android:taskAffinity=""
android:label="@string/wifi_settings" android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
@@ -141,6 +141,7 @@
<!-- Keep compatibility with old shortcuts. --> <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".wifi.WifiSettings" <activity-alias android:name=".wifi.WifiSettings"
android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:label="@string/wifi_settings" android:label="@string/wifi_settings"
android:targetActivity="Settings$WifiSettingsActivity" android:targetActivity="Settings$WifiSettingsActivity"
@@ -153,6 +154,7 @@
</activity-alias> </activity-alias>
<activity android:name=".wifi.WifiPickerActivity" <activity android:name=".wifi.WifiPickerActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter> <intent-filter>
@@ -163,6 +165,7 @@
</activity> </activity>
<activity android:name=".wifi.WifiSetupActivity" <activity android:name=".wifi.WifiSetupActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:theme="@style/setup_wizard_theme" android:theme="@style/setup_wizard_theme"
android:label="@string/wifi_setup_wizard_title" android:label="@string/wifi_setup_wizard_title"
android:icon="@drawable/empty_icon" android:icon="@drawable/empty_icon"
@@ -175,6 +178,7 @@
</activity> </activity>
<activity android:name=".wifi.WifiSettingsForSetupWizardXL" <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
android:uiOptions="splitActionBarWhenNarrow"
android:theme="@android:style/Theme.Holo.NoActionBar" android:theme="@android:style/Theme.Holo.NoActionBar"
android:screenOrientation="behind" android:screenOrientation="behind"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
@@ -254,7 +258,6 @@
<activity android:name="ApnSettings" <activity android:name="ApnSettings"
android:label="@string/apn_settings" android:label="@string/apn_settings"
android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
@@ -266,6 +269,7 @@
</activity> </activity>
<activity android:name="Settings$BluetoothSettingsActivity" <activity android:name="Settings$BluetoothSettingsActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:label="@string/bluetooth_settings_title" android:label="@string/bluetooth_settings_title"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">
@@ -284,6 +288,7 @@
<!-- Keep compatibility with old shortcuts. --> <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".bluetooth.BluetoothSettings" <activity-alias android:name=".bluetooth.BluetoothSettings"
android:uiOptions="splitActionBarWhenNarrow"
android:label="@string/bluetooth_settings_title" android:label="@string/bluetooth_settings_title"
android:targetActivity="Settings$BluetoothSettingsActivity" android:targetActivity="Settings$BluetoothSettingsActivity"
android:exported="true" android:exported="true"
@@ -295,6 +300,7 @@
</activity-alias> </activity-alias>
<activity android:name=".bluetooth.DevicePickerActivity" <activity android:name=".bluetooth.DevicePickerActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_picker" android:label="@string/device_picker"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
@@ -306,7 +312,6 @@
<activity android:name="Settings$TetherSettingsActivity" <activity android:name="Settings$TetherSettingsActivity"
android:label="@string/tether_settings_title_all" android:label="@string/tether_settings_title_all"
android:uiOptions="none"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>
@@ -328,7 +333,6 @@
<!-- Keep compatibility with old shortcuts. --> <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".TetherSettings" <activity-alias android:name=".TetherSettings"
android:label="@string/tether_settings_title_all" android:label="@string/tether_settings_title_all"
android:uiOptions="none"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
android:exported="true" android:exported="true"
android:targetActivity="Settings$TetherSettingsActivity"> android:targetActivity="Settings$TetherSettingsActivity">
@@ -343,6 +347,7 @@
</activity-alias> </activity-alias>
<activity android:name="Settings$WifiP2pSettingsActivity" <activity android:name="Settings$WifiP2pSettingsActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity"> android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter> <intent-filter>
@@ -505,7 +510,6 @@
<activity android:name="Settings$UserDictionarySettingsActivity" <activity android:name="Settings$UserDictionarySettingsActivity"
android:label="@string/user_dict_settings_titlebar" android:label="@string/user_dict_settings_titlebar"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:uiOptions="none"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity"> android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -649,8 +653,7 @@
<activity android:name="Settings$ManageApplicationsActivity" <activity android:name="Settings$ManageApplicationsActivity"
android:label="@string/applications_settings" android:label="@string/applications_settings"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true" android:excludeFromRecents="true">
android:uiOptions="none">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APPLICATION_SETTINGS" /> <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -767,7 +770,6 @@
<activity android:name="Settings$LocationSettingsActivity" <activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title" android:label="@string/location_settings_title"
android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">
@@ -975,7 +977,6 @@
<activity android:name="Settings$StorageSettingsActivity" <activity android:name="Settings$StorageSettingsActivity"
android:label="@string/storage_settings_title" android:label="@string/storage_settings_title"
android:uiOptions="none"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter> <intent-filter>
@@ -1342,7 +1343,6 @@
<activity android:name="Settings$PowerUsageSummaryActivity" <activity android:name="Settings$PowerUsageSummaryActivity"
android:label="@string/power_usage_summary_title" android:label="@string/power_usage_summary_title"
android:uiOptions="none"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>
@@ -1371,8 +1371,7 @@
<activity android:name="Settings$AccountSyncSettingsActivity" <activity android:name="Settings$AccountSyncSettingsActivity"
android:label="@string/account_sync_settings_title" android:label="@string/account_sync_settings_title"
android:taskAffinity="" android:taskAffinity=""
android:parentActivityName="Settings" android:parentActivityName="Settings">
android:uiOptions="none">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" /> <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1454,7 +1453,6 @@
<activity android:name="Settings$DataUsageSummaryActivity" <activity android:name="Settings$DataUsageSummaryActivity"
android:label="@string/data_usage_summary_title" android:label="@string/data_usage_summary_title"
android:uiOptions="none"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>
@@ -1469,6 +1467,7 @@
</activity> </activity>
<activity android:name="Settings$DreamSettingsActivity" <activity android:name="Settings$DreamSettingsActivity"
android:uiOptions="splitActionBarWhenNarrow"
android:label="@string/screensaver_settings_title" android:label="@string/screensaver_settings_title"
android:taskAffinity="" android:taskAffinity=""
android:excludeFromRecents="true"> android:excludeFromRecents="true">

58
src/com/android/settings/Settings.java
View File

@@ -16,19 +16,6 @@
package com.android.settings; 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.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.OnAccountsUpdateListener; import android.accounts.OnAccountsUpdateListener;
@@ -62,6 +49,17 @@ import android.widget.ListAdapter;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView; 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.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -85,7 +83,7 @@ public class Settings extends PreferenceActivity
private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS = private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =
"com.android.settings.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_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";
private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER"; private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
@@ -136,8 +134,8 @@ public class Settings extends PreferenceActivity
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) { if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
getWindow().setUiOptions(0); getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
} }
mAuthenticatorHelper = new AuthenticatorHelper(); mAuthenticatorHelper = new AuthenticatorHelper();
@@ -379,26 +377,14 @@ public class Settings extends PreferenceActivity
Intent intent = super.onBuildStartFragmentIntent(fragmentName, args, Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
titleRes, shortTitleRes); titleRes, shortTitleRes);
// some fragments want to avoid split actionbar // Some fragments want split ActionBar; these should stay in sync with
if (DataUsageSummary.class.getName().equals(fragmentName) || // uiOptions for fragments also defined as activities in manifest.
PowerUsageSummary.class.getName().equals(fragmentName) || if (WifiSettings.class.getName().equals(fragmentName) ||
AccountSyncSettings.class.getName().equals(fragmentName) || WifiP2pSettings.class.getName().equals(fragmentName) ||
UserDictionarySettings.class.getName().equals(fragmentName) || BluetoothSettings.class.getName().equals(fragmentName) ||
Memory.class.getName().equals(fragmentName) || DreamSettings.class.getName().equals(fragmentName) ||
ManageApplications.class.getName().equals(fragmentName) || ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) {
WirelessSettings.class.getName().equals(fragmentName) || intent.putExtra(EXTRA_UI_OPTIONS, ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
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);
} }
intent.setClass(this, SubSettings.class); intent.setClass(this, SubSettings.class);