diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-06-12 18:37:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 18:37:35 +0000 |
commit | d59d4e25de9be61f90356ed082a690719e4b171a (patch) | |
tree | 6166f61e583704826925bc4387254d73ffc0b100 | |
parent | a6f8f8b3d9dab80e3677b6452f3c03d7941b93ba (diff) | |
parent | 3864cda8fd9f136838481e07c4bd942012eb67ec (diff) | |
download | packages_apps_Settings-d59d4e25de9be61f90356ed082a690719e4b171a.zip packages_apps_Settings-d59d4e25de9be61f90356ed082a690719e4b171a.tar.gz packages_apps_Settings-d59d4e25de9be61f90356ed082a690719e4b171a.tar.bz2 |
am 3864cda8: Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev
* commit '3864cda8fd9f136838481e07c4bd942012eb67ec':
In a document centric world, hiding from recents makes no sense.
-rw-r--r-- | AndroidManifest.xml | 81 |
1 files changed, 26 insertions, 55 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 059e9a0..c8362f0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -130,8 +130,7 @@ <activity android:name="Settings$WifiSettingsActivity" android:taskAffinity="" android:label="@string/wifi_settings" - android:configChanges="orientation|keyboardHidden|screenSize" - android:excludeFromRecents="true"> + android:configChanges="orientation|keyboardHidden|screenSize"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.WIFI_SETTINGS" /> @@ -270,8 +269,7 @@ <activity android:name="Settings$BluetoothSettingsActivity" android:label="@string/bluetooth_settings_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.BLUETOOTH_SETTINGS" /> @@ -309,8 +307,7 @@ <activity android:name="Settings$TetherSettingsActivity" android:label="@string/tether_settings_title_all" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -352,8 +349,7 @@ <activity android:name="Settings$VpnSettingsActivity" android:label="@string/vpn_settings_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.net.vpn.SETTINGS" /> @@ -369,8 +365,7 @@ <activity android:name="Settings$DateTimeSettingsActivity" android:label="@string/date_and_time" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.DATE_SETTINGS" /> @@ -527,8 +522,7 @@ <activity android:name="Settings$ZenModeSettingsActivity" android:label="@string/zen_mode_settings_title" android:exported="true" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ZEN_MODE_SETTINGS" /> @@ -543,8 +537,7 @@ <activity android:name="Settings$DisplaySettingsActivity" android:label="@string/display_settings" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="com.android.settings.DISPLAY_SETTINGS" /> @@ -608,8 +601,7 @@ <activity android:name="Settings$ManageApplicationsActivity" android:label="@string/applications_settings" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.APPLICATION_SETTINGS" /> @@ -737,8 +729,7 @@ <activity android:name="Settings$NotificationStationActivity" android:theme="@android:style/Theme.DeviceDefault" android:label="@string/notification_log_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -752,7 +743,6 @@ <activity android:name="Settings$AppOpsSummaryActivity" android:label="@string/app_ops_settings" android:taskAffinity="" - android:excludeFromRecents="true" android:enabled="false"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -771,8 +761,7 @@ <activity android:name="Settings$LocationSettingsActivity" android:label="@string/location_settings_title" android:configChanges="orientation|keyboardHidden|screenSize" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" /> @@ -807,8 +796,7 @@ <activity android:name="MonitoringCertInfoActivity" android:label="@string/ssl_ca_cert_dialog_title" android:theme="@style/Transparent" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="com.android.settings.MONITORING_CERT_INFO" /> @@ -818,8 +806,7 @@ <activity android:name="Settings$TrustedCredentialsSettingsActivity" android:label="@string/trusted_credentials" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="com.android.settings.TRUSTED_CREDENTIALS" /> @@ -930,8 +917,7 @@ <activity android:name="Settings$AccessibilitySettingsActivity" android:label="@string/accessibility_settings" android:configChanges="orientation|keyboardHidden|screenSize" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACCESSIBILITY_SETTINGS" /> @@ -1308,8 +1294,7 @@ <activity android:name="Settings$WifiDisplaySettingsActivity" android:label="@string/wifi_display_settings_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.WIFI_DISPLAY_SETTINGS" /> @@ -1437,8 +1422,7 @@ <activity android:name="Settings$PowerUsageSummaryActivity" android:label="@string/power_usage_summary_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.POWER_USAGE_SUMMARY" /> @@ -1464,8 +1448,7 @@ <activity android:name="Settings$BatterySaverSettingsActivity" android:label="@string/battery_saver" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.BATTERY_SAVER_SETTINGS" /> @@ -1567,8 +1550,7 @@ <activity android:name="Settings$DataUsageSummaryActivity" android:label="@string/data_usage_summary_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -1582,8 +1564,7 @@ <activity android:name="Settings$DreamSettingsActivity" android:label="@string/screensaver_settings_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.DREAM_SETTINGS" /> @@ -1598,8 +1579,7 @@ <activity android:name="Settings$UserSettingsActivity" android:label="@string/user_settings_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.USER_SETTINGS" /> @@ -1613,8 +1593,7 @@ <activity android:name="Settings$PaymentSettingsActivity" android:label="@string/nfc_payment_settings_title" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.NFC_PAYMENT_SETTINGS" /> @@ -1657,8 +1636,7 @@ <activity android:name="Settings$NotificationAccessSettingsActivity" android:label="@string/manage_notification_access" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" /> @@ -1672,8 +1650,7 @@ <activity android:name="Settings$ConditionProviderSettingsActivity" android:label="@string/manage_condition_providers" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" /> @@ -1688,8 +1665,7 @@ <activity android:name="Settings$NotificationSettingsActivity" android:label="@string/notification_settings" android:exported="true" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.NOTIFICATION_SETTINGS" /> @@ -1706,7 +1682,6 @@ <activity-alias android:name="Settings$SoundSettingsActivity" android:label="@string/notification_settings" android:taskAffinity="" - android:excludeFromRecents="true" android:targetActivity="Settings$NotificationSettingsActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -1735,8 +1710,7 @@ <activity android:name="Settings$NotificationDisplaySettingsActivity" android:label="@string/notification_display_settings" android:exported="true" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACTION_NOTIFICATION_DISPLAY_SETTINGS" /> @@ -1751,8 +1725,7 @@ <activity android:name="Settings$OtherSoundSettingsActivity" android:label="@string/other_sound_settings" android:exported="true" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACTION_OTHER_SOUND_SETTINGS" /> @@ -1767,8 +1740,7 @@ <activity android:name="Settings$AppNotificationSettingsActivity" android:label="@string/app_notifications_title" android:exported="true" - android:taskAffinity="" - android:excludeFromRecents="true"> + android:taskAffinity=""> <intent-filter> <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.ACTION_APP_NOTIFICATION_SETTINGS" /> @@ -1784,7 +1756,6 @@ <activity android:name="RegulatoryInfoDisplayActivity" android:label="@string/regulatory_information" android:taskAffinity="" - android:excludeFromRecents="true" android:enabled="@bool/config_show_regulatory_info"> <intent-filter> <action android:name="android.settings.SHOW_REGULATORY_INFO" /> |