diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-11-28 17:09:19 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-11-29 14:50:02 -0800 |
| commit | c2b43dbee88e3cc12f267610fc077b021f31207a (patch) | |
| tree | e410626cc114e5bb52d916603303c6a908f079e7 /AndroidManifest.xml | |
| parent | 0206284a661b3370a175bb8c28c005aa6b45d9d3 (diff) | |
| download | packages_apps_settings-c2b43dbee88e3cc12f267610fc077b021f31207a.zip packages_apps_settings-c2b43dbee88e3cc12f267610fc077b021f31207a.tar.gz packages_apps_settings-c2b43dbee88e3cc12f267610fc077b021f31207a.tar.bz2 | |
Avoid split action bar when it only has one item. DO NOT MERGE.
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 8 insertions, 3 deletions
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"> |