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

Merge "Specify up navigation behavior"

Browse Source
This commit is contained in:
Adam Powell
2012-04-05 16:24:19 -07:00
committed by Android (Google) Code Review
parent f35dd41da2 faba7e4d9f
commit c48bf55b28
2 changed files with 101 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
AndroidManifest.xml
View File

@@ -77,7 +77,8 @@
</activity> </activity>
<activity android:name=".SubSettings" <activity android:name=".SubSettings"
android:taskAffinity="com.android.settings"> android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
</activity> </activity>
<activity android:name="CreateShortcut" android:label="@string/settings_shortcut" <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
@@ -91,7 +92,8 @@
<!-- Wireless Controls --> <!-- Wireless Controls -->
<activity android:name="Settings$WirelessSettingsActivity" <activity android:name="Settings$WirelessSettingsActivity"
android:label="@string/wireless_networks_settings_title"> android:label="@string/wireless_networks_settings_title"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.WIRELESS_SETTINGS" /> <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -112,7 +114,8 @@
<activity android:name="Settings$WifiSettingsActivity" <activity android:name="Settings$WifiSettingsActivity"
android:label="@string/wifi_settings" android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.WIFI_SETTINGS" /> <action android:name="android.settings.WIFI_SETTINGS" />
@@ -140,7 +143,8 @@
</activity-alias> </activity-alias>
<activity android:name=".wifi.WifiPickerActivity" <activity android:name=".wifi.WifiPickerActivity"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.net.wifi.PICK_WIFI_NETWORK" /> <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -158,7 +162,8 @@
<activity android:name="Settings$AdvancedWifiSettingsActivity" <activity android:name="Settings$AdvancedWifiSettingsActivity"
android:label="@string/wifi_advanced_settings_label" android:label="@string/wifi_advanced_settings_label"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.WIFI_IP_SETTINGS" /> <action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -176,7 +181,8 @@
</activity> </activity>
<activity android:name=".wifi.WifiInfo" <activity android:name=".wifi.WifiInfo"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"> android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -185,7 +191,8 @@
</activity> </activity>
<activity android:name=".wifi.WifiConfigInfo" <activity android:name=".wifi.WifiConfigInfo"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"> android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -223,7 +230,8 @@
<activity android:name="ApnSettings" android:label="@string/apn_settings" <activity android:name="ApnSettings" android:label="@string/apn_settings"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask"> android:launchMode="singleTask"
android:parentActivityName="Settings$WirelessSettingsActivity">
<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" />
@@ -234,7 +242,8 @@
<activity android:name="Settings$BluetoothSettingsActivity" <activity android:name="Settings$BluetoothSettingsActivity"
android:label="@string/bluetooth_settings_title" android:label="@string/bluetooth_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.BLUETOOTH_SETTINGS" /> <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -263,7 +272,8 @@
<activity android:name=".bluetooth.DevicePickerActivity" <activity android:name=".bluetooth.DevicePickerActivity"
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"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.bluetooth.devicepicker.action.LAUNCH" /> <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -272,7 +282,8 @@
<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:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -306,7 +317,8 @@
</activity-alias> </activity-alias>
<activity android:name="Settings$WifiP2pSettingsActivity" <activity android:name="Settings$WifiP2pSettingsActivity"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -325,7 +337,8 @@
<activity android:name="Settings$VpnSettingsActivity" <activity android:name="Settings$VpnSettingsActivity"
android:label="@string/vpn_settings_title" android:label="@string/vpn_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.net.vpn.SETTINGS" /> <action android:name="android.net.vpn.SETTINGS" />
@@ -344,7 +357,8 @@
</activity> </activity>
<activity android:name="Settings$DateTimeSettingsActivity" <activity android:name="Settings$DateTimeSettingsActivity"
android:label="@string/date_and_time"> android:label="@string/date_and_time"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.DATE_SETTINGS" /> <action android:name="android.settings.DATE_SETTINGS" />
@@ -368,7 +382,8 @@
<activity android:name="Settings$LocalePickerActivity" <activity android:name="Settings$LocalePickerActivity"
android:label="@string/language_picker_title" android:label="@string/language_picker_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.LOCALE_SETTINGS" /> <action android:name="android.settings.LOCALE_SETTINGS" />
@@ -383,7 +398,8 @@
<activity android:name="Settings$InputMethodAndLanguageSettingsActivity" <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
android:label="@string/language_keyboard_settings_title" android:label="@string/language_keyboard_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.INPUT_METHOD_SETTINGS" /> <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
@@ -423,7 +439,8 @@
<activity android:name="Settings$SpellCheckersSettingsActivity" <activity android:name="Settings$SpellCheckersSettingsActivity"
android:label="@string/spellcheckers_settings_title" android:label="@string/spellcheckers_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -459,7 +476,9 @@
<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:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:uiOptions="none"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.USER_DICTIONARY_SETTINGS" /> <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
@@ -508,7 +527,8 @@
<activity android:name="Settings$SoundSettingsActivity" <activity android:name="Settings$SoundSettingsActivity"
android:label="@string/sound_settings" android:label="@string/sound_settings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.SOUND_SETTINGS" /> <action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -537,7 +557,8 @@
<activity android:name="Settings$DisplaySettingsActivity" <activity android:name="Settings$DisplaySettingsActivity"
android:label="@string/display_settings" android:label="@string/display_settings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.DISPLAY_SETTINGS" /> <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -567,7 +588,8 @@
<activity android:name="Settings$DockSettingsActivity" <activity android:name="Settings$DockSettingsActivity"
android:label="@string/dock_settings_title" android:label="@string/dock_settings_title"
android:enabled="@bool/has_dock_settings" android:enabled="@bool/has_dock_settings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.DOCK_SETTINGS" /> <action android:name="com.android.settings.DOCK_SETTINGS" />
@@ -595,7 +617,8 @@
<activity android:name="Settings$DeviceInfoSettingsActivity" <activity android:name="Settings$DeviceInfoSettingsActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_info_settings"> android:label="@string/device_info_settings"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.DEVICE_INFO_SETTINGS" /> <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
@@ -629,7 +652,9 @@
<activity android:name="Settings$ManageApplicationsActivity" <activity android:name="Settings$ManageApplicationsActivity"
android:label="@string/applications_settings" android:label="@string/applications_settings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
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.APPLICATION_SETTINGS" /> <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -696,7 +721,8 @@
InstalledAppDetails. --> InstalledAppDetails. -->
<activity android:name=".applications.InstalledAppDetailsTop" <activity android:name=".applications.InstalledAppDetailsTop"
android:label="@string/application_info_label" android:label="@string/application_info_label"
android:exported="true"> android:exported="true"
android:parentActivityName="Settings$ManageApplicationsActivity">
</activity> </activity>
<!-- Keep compatibility with old shortcuts. --> <!-- Keep compatibility with old shortcuts. -->
@@ -713,7 +739,8 @@
<!-- Provide direct entry into manage apps showing running services. --> <!-- Provide direct entry into manage apps showing running services. -->
<activity android:name="Settings$RunningServicesActivity" <activity android:name="Settings$RunningServicesActivity"
android:label="@string/runningservices_settings_title"> android:label="@string/runningservices_settings_title"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -728,7 +755,8 @@
<!-- Provide direct entry into manage apps showing storage usage of apps. --> <!-- Provide direct entry into manage apps showing storage usage of apps. -->
<activity android:name="Settings$StorageUseActivity" <activity android:name="Settings$StorageUseActivity"
android:label="@string/storageuse_settings_title"> android:label="@string/storageuse_settings_title"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -745,7 +773,8 @@
<activity android:name="Settings$LocationSettingsActivity" <activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title" android:label="@string/location_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" /> <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
@@ -763,7 +792,8 @@
<activity android:name="Settings$SecuritySettingsActivity" <activity android:name="Settings$SecuritySettingsActivity"
android:label="@string/security_settings_title" android:label="@string/security_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SECURITY_SETTINGS" /> <action android:name="android.settings.SECURITY_SETTINGS" />
@@ -793,7 +823,8 @@
<activity android:name="Settings$PrivacySettingsActivity" <activity android:name="Settings$PrivacySettingsActivity"
android:label="@string/privacy_settings_title" android:label="@string/privacy_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.PRIVACY_SETTINGS" /> <action android:name="android.settings.PRIVACY_SETTINGS" />
@@ -826,7 +857,8 @@
<activity android:name="Settings$DeviceAdminSettingsActivity" <activity android:name="Settings$DeviceAdminSettingsActivity"
android:label="@string/device_admin_settings_title" android:label="@string/device_admin_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$SecuritySettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -871,7 +903,8 @@
<activity android:name="IccLockSettings" <activity android:name="IccLockSettings"
android:label="@string/sim_lock_settings" android:label="@string/sim_lock_settings"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:process="com.android.phone"> android:process="com.android.phone"
android:parentActivityName="Settings$SecuritySettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -882,7 +915,8 @@
<activity android:name="Settings$AccessibilitySettingsActivity" <activity android:name="Settings$AccessibilitySettingsActivity"
android:label="@string/accessibility_settings" android:label="@string/accessibility_settings"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.ACCESSIBILITY_SETTINGS" /> <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -897,7 +931,8 @@
</activity> </activity>
<activity android:name="Settings$TextToSpeechSettingsActivity" <activity android:name="Settings$TextToSpeechSettingsActivity"
android:label="@string/tts_settings"> android:label="@string/tts_settings"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.TTS_SETTINGS" /> <action android:name="com.android.settings.TTS_SETTINGS" />
@@ -938,7 +973,8 @@
<activity android:name=".deviceinfo.Status" <activity android:name=".deviceinfo.Status"
android:label="@string/device_status_activity_title" android:label="@string/device_status_activity_title"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:process="com.android.phone"> android:process="com.android.phone"
android:parentActivityName="Settings$DeviceInfoSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -947,7 +983,9 @@
</activity> </activity>
<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:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" /> <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -1007,7 +1045,8 @@
<activity android:name="Settings$DevelopmentSettingsActivity" <activity android:name="Settings$DevelopmentSettingsActivity"
android:label="@string/development_settings_title" android:label="@string/development_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1037,7 +1076,8 @@
<activity android:name="Settings$UsbSettingsActivity" <activity android:name="Settings$UsbSettingsActivity"
android:label="@string/storage_title_usb" android:label="@string/storage_title_usb"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$StorageSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.STORAGE_USB_SETTINGS" /> <action android:name="android.settings.STORAGE_USB_SETTINGS" />
@@ -1163,7 +1203,8 @@
<!-- NFC settings --> <!-- NFC settings -->
<activity android:name="Settings$AndroidBeamSettingsActivity" <activity android:name="Settings$AndroidBeamSettingsActivity"
android:label="@string/android_beam_settings_title" android:label="@string/android_beam_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.NFCSHARING_SETTINGS" /> <action android:name="android.settings.NFCSHARING_SETTINGS" />
@@ -1204,7 +1245,8 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name="BatteryInfo" android:label="@string/battery_info_label"> <activity android:name="BatteryInfo" android:label="@string/battery_info_label"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -1213,7 +1255,8 @@
</activity> </activity>
<activity android:name="Display" android:label="@string/display_label" <activity android:name="Display" android:label="@string/display_label"
android:configChanges="fontScale"> android:configChanges="fontScale"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -1267,7 +1310,7 @@
<!-- Standard picker for widgets --> <!-- Standard picker for widgets -->
<activity android:name="AppWidgetPickActivity" <activity android:name="AppWidgetPickActivity"
android:label="@string/widget_picker_title" android:label="@string/widget_picker_title"
android:theme="@*android:style/Theme.Dialog.Alert" android:theme="@*android:style/Theme.Holo.Dialog.Alert"
android:finishOnCloseSystemDialogs="true"> android:finishOnCloseSystemDialogs="true">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_PICK" /> <action android:name="android.appwidget.action.APPWIDGET_PICK" />
@@ -1275,7 +1318,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="UsageStats" android:label="@string/usage_stats_label"> <activity android:name="UsageStats" android:label="@string/usage_stats_label"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -1283,7 +1327,9 @@
</activity> </activity>
<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:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" /> <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -1309,7 +1355,8 @@
<activity <activity
android:name="Settings$ManageAccountsSettingsActivity" android:name="Settings$ManageAccountsSettingsActivity"
android:label="@string/sync_settings"> android:label="@string/sync_settings"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SYNC_SETTINGS" /> <action android:name="android.settings.SYNC_SETTINGS" />
@@ -1322,7 +1369,9 @@
</activity> </activity>
<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:uiOptions="none"
android:parentActivityName="Settings$ManageAccountsSettingsActivity">
<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" />
@@ -1337,7 +1386,8 @@
<activity android:name="com.android.settings.accounts.AddAccountSettings" <activity android:name="com.android.settings.accounts.AddAccountSettings"
android:theme="@android:style/Theme.Translucent.NoTitleBar" android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/header_add_an_account"> android:label="@string/header_add_an_account"
android:parentActivityName="Settings$ManageAccountsSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.ADD_ACCOUNT_SETTINGS" /> <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
@@ -1392,7 +1442,8 @@
<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:uiOptions="none"
android:parentActivityName="Settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

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

@@ -18,6 +18,7 @@ package com.android.settings;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.settings.accounts.AccountSyncSettings; import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.applications.ManageApplications;
import com.android.settings.bluetooth.BluetoothEnabler; import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.deviceinfo.Memory; import com.android.settings.deviceinfo.Memory;
import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -316,7 +317,8 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
PowerUsageSummary.class.getName().equals(fragmentName) || PowerUsageSummary.class.getName().equals(fragmentName) ||
AccountSyncSettings.class.getName().equals(fragmentName) || AccountSyncSettings.class.getName().equals(fragmentName) ||
UserDictionarySettings.class.getName().equals(fragmentName) || UserDictionarySettings.class.getName().equals(fragmentName) ||
Memory.class.getName().equals(fragmentName)) { Memory.class.getName().equals(fragmentName) ||
ManageApplications.class.getName().equals(fragmentName)) {
intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true); intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
} }