Avoid split action bar when it only has one item. DO NOT MERGE.
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 71cc520..c78d46b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -252,9 +252,11 @@
</intent-filter>
</activity-alias>
- <activity android:name="ApnSettings" android:label="@string/apn_settings"
- android:configChanges="orientation|keyboardHidden|screenSize"
- android:launchMode="singleTask">
+ <activity android:name="ApnSettings"
+ android:label="@string/apn_settings"
+ android:uiOptions="none"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APN_SETTINGS" />
@@ -304,6 +306,7 @@
<activity android:name="Settings$TetherSettingsActivity"
android:label="@string/tether_settings_title_all"
+ android:uiOptions="none"
android:taskAffinity=""
android:excludeFromRecents="true">
<intent-filter>
@@ -325,6 +328,7 @@
<!-- 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">
@@ -763,6 +767,7 @@
<activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
+ android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity=""
android:excludeFromRecents="true">
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f045db0..d94103e 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -393,7 +393,11 @@
VpnSettings.class.getName().equals(fragmentName) ||
SecuritySettings.class.getName().equals(fragmentName) ||
InstalledAppDetails.class.getName().equals(fragmentName) ||
- ChooseLockGenericFragment.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);
}