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

Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-11-29 17:58:19 -08:00
committed by Android (Google) Code Review
parent 6e8644bcca c2b43dbee8
commit 5d376860e9
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AndroidManifest.xml
View File

@@ -252,9 +252,11 @@
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity android:name="ApnSettings" android:label="@string/apn_settings" <activity android:name="ApnSettings"
android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/apn_settings"
android:launchMode="singleTask"> android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APN_SETTINGS" /> <action android:name="android.settings.APN_SETTINGS" />
@@ -304,6 +306,7 @@
<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>
@@ -325,6 +328,7 @@
<!-- 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">
@@ -763,6 +767,7 @@
<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">

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

@@ -393,7 +393,11 @@ public class Settings extends PreferenceActivity
VpnSettings.class.getName().equals(fragmentName) || VpnSettings.class.getName().equals(fragmentName) ||
SecuritySettings.class.getName().equals(fragmentName) || SecuritySettings.class.getName().equals(fragmentName) ||
InstalledAppDetails.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); intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
} }