<uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+ <uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.VIBRATE" />
<!-- Wireless Controls -->
<activity android:name="WirelessSettings"
- android:label="@string/radio_controls_title"
+ android:label="@string/wireless_networks_settings_title"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
- <action android:name="android.bluetooth.intent.action.DEVICE_PICKER" />
+ <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</intent-filter>
</activity>
- <activity android:name="LanguageSettings" android:label="@string/language_picker_title"
+ <activity android:name="LanguageSettings"
+ android:label="@string/language_keyboard_settings_title"
android:clearTaskOnLaunch="true"
>
<intent-filter>
</intent-filter>
</activity>
- <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"
+ <activity android:name="SoundAndDisplaySettings"
+ android:label="@string/sound_and_display_settings_title"
android:clearTaskOnLaunch="true"
>
<intent-filter>
</intent-filter>
</activity>
+ <activity android:name="SettingsSafetyLegalActivity"
+ android:label="@string/settings_safetylegal_activity_title"
+ android:theme="@*android:style/Theme.Dialog.Alert">
+ <intent-filter>
+ <action android:name="android.settings.SAFETY" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name="ApplicationSettings" android:label="@string/applications_settings_header"
>
<intent-filter>
</intent-filter>
</activity>
- <activity android:name="SecuritySettings" android:label="@string/security_settings_title"
+ <activity android:name="SecuritySettings"
+ android:label="@string/location_security_settings_title"
android:configChanges="orientation|keyboardHidden"
android:clearTaskOnLaunch="true"
>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SECURITY_SETTINGS" />
<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
- <action android:name="android.security.ADD_CREDENTIAL" />
- <action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" />
+ <action android:name="android.credentials.UNLOCK" />
+ <action android:name="android.credentials.SYSTEM_INSTALL" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
</activity>
+ <activity android:name="PrivacySettings"
+ android:label="@string/privacy_settings_title"
+ android:configChanges="orientation|keyboardHidden"
+ android:clearTaskOnLaunch="true"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.PRIVACY_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ </intent-filter>
+ </activity>
+
<activity android:name="IccLockSettings" android:label="@string/sim_lock_settings"
android:process="com.android.phone">
<intent-filter>
</intent-filter>
</activity>
- <activity android:name="AccessibilitySettings" android:label="@string/accessibility_settings_title"
- android:theme="@android:style/Theme.NoTitleBar">
+ <activity android:name="AccessibilitySettings"
+ android:label="@string/accessibility_settings_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
+ <!-- Wtf... this action is bogus! Can we remove it? -->
<action android:name="ACCESSIBILITY_FEEDBACK_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
</activity>
- <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title">
+ <activity android:name=".deviceinfo.Memory"
+ android:label="@string/storage_settings_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
android:label="@string/bluetooth_connect_specific_profiles_title" />
<activity android:name=".bluetooth.BluetoothPairingDialog"
- android:label="@string/bluetooth_pin_entry"
+ android:label="@string/bluetooth_pairing_request"
+ android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Dialog.Alert">
<intent-filter>
- <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
+ <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<receiver android:name=".bluetooth.BluetoothPairingRequest">
<intent-filter>
- <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
- <action android:name="android.bluetooth.intent.action.PAIRING_CANCEL" />
+ <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
+ <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
</intent-filter>
</receiver>
<activity android:name="ActivityPicker"
android:label="@string/activity_picker_label"
- android:theme="@*android:style/Theme.Dialog.Alert">
+ android:theme="@*android:style/Theme.Dialog.Alert"
+ android:finishOnCloseSystemDialogs="true">
<intent-filter>
<action android:name="android.intent.action.PICK_ACTIVITY" />
<category android:name="android.intent.category.DEFAULT" />
<!-- Standard picker for widgets -->
<activity android:name="AppWidgetPickActivity"
android:label="@string/widget_picker_title"
- android:theme="@*android:style/Theme.Dialog.Alert">
+ android:theme="@*android:style/Theme.Dialog.Alert"
+ android:finishOnCloseSystemDialogs="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_PICK" />
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
<action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />
- <action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED" />
+ <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
<action android:name="android.intent.action.CLOSE_SYSTEM_DIALOGS" /> <!-- pick up misc changes -->
</intent-filter>
<meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />