android:icon="@mipmap/ic_launcher_settings"
android:taskAffinity=""
android:theme="@android:style/Theme.Holo"
- android:uiOptions="splitActionBarWhenNarrow"
android:hardwareAccelerated="true"
android:supportsRtl="true">
<!-- Top-level settings -->
<activity android:name="Settings$WifiSettingsActivity"
+ android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity=""
android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden|screenSize"
<!-- 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"
</activity-alias>
<activity android:name=".wifi.WifiPickerActivity"
+ android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
</activity>
<activity android:name=".wifi.WifiSetupActivity"
- android:theme="@style/setup_wizard_theme"
- android:label="@string/wifi_setup_wizard_title"
+ android:uiOptions="splitActionBarWhenNarrow"
+ android:theme="@style/setup_wizard_theme"
+ android:label="@string/wifi_setup_wizard_title"
android:icon="@drawable/empty_icon"
- android:clearTaskOnLaunch="true">
+ android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
</activity>
<activity android:name=".wifi.WifiSettingsForSetupWizardXL"
- android:theme="@android:style/Theme.Holo.NoActionBar"
- android:screenOrientation="behind"
- android:clearTaskOnLaunch="true"
- android:windowSoftInputMode="adjustResize"
- android:exported="true" />
+ android:uiOptions="splitActionBarWhenNarrow"
+ android:theme="@android:style/Theme.Holo.NoActionBar"
+ android:screenOrientation="behind"
+ android:clearTaskOnLaunch="true"
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true" />
<activity android:name="Settings$AdvancedWifiSettingsActivity"
android:taskAffinity="com.android.settings"
<activity android:name="ApnSettings"
android:label="@string/apn_settings"
- android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask">
<intent-filter>
</activity>
<activity android:name="Settings$BluetoothSettingsActivity"
+ android:uiOptions="splitActionBarWhenNarrow"
android:label="@string/bluetooth_settings_title"
android:taskAffinity=""
android:excludeFromRecents="true">
<!-- 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"
</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">
<activity android:name="Settings$TetherSettingsActivity"
android:label="@string/tether_settings_title_all"
- android:uiOptions="none"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
<!-- 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">
</activity-alias>
<activity android:name="Settings$WifiP2pSettingsActivity"
+ android:uiOptions="splitActionBarWhenNarrow"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
<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" />
<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" />
<activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
- android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity=""
android:excludeFromRecents="true">
<activity android:name="Settings$StorageSettingsActivity"
android:label="@string/storage_settings_title"
- android:uiOptions="none"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<activity android:name="Settings$PowerUsageSummaryActivity"
android:label="@string/power_usage_summary_title"
- android:uiOptions="none"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
<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" />
<activity android:name="Settings$DataUsageSummaryActivity"
android:label="@string/data_usage_summary_title"
- android:uiOptions="none"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
</activity>
<activity android:name="Settings$DreamSettingsActivity"
+ android:uiOptions="splitActionBarWhenNarrow"
android:label="@string/screensaver_settings_title"
android:taskAffinity=""
android:excludeFromRecents="true">
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;
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;
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";
@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();
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);