package="com.android.settings"
android:sharedUserId="android.uid.system">
+ <original-package android:name="com.android.settings" />
+
<uses-permission android:name="com.google.android.gm.permission.WRITE_GMAIL" />
<uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.BATTERY_STATS"/>
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
<uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.MOVE_PACKAGE" />
<application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings"
<!-- Top-level settings -->
- <activity android:name=".wifi.WifiSettings" android:label="@string/wifi_settings"
+ <activity android:name=".wifi.WifiSettings"
+ android:label="@string/wifi_settings"
+ android:configChanges="orientation|keyboardHidden"
android:clearTaskOnLaunch="true"
>
<intent-filter>
</intent-filter>
</activity>
- <activity android:name=".wifi.AdvancedSettings" android:label="@string/wifi_ip_settings_titlebar"
+ <activity android:name=".wifi.AdvancedSettings"
+ android:label="@string/wifi_ip_settings_titlebar"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
+ <activity android:name=".wifi.WifiApSettings">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ </intent-filter>
+ </activity>
<activity android:name="ApnSettings" android:label="@string/apn_settings"
android:configChanges="orientation|keyboardHidden"
</intent-filter>
</activity>
+ <activity android:name=".TetherSettings"
+ android:clearTaskOnLaunch="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ </intent-filter>
+ </activity>
+
<activity android:name=".vpn.VpnSettings"
android:configChanges="orientation|keyboardHidden"
- android:launchMode="singleTask">
+ android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.net.vpn.SETTINGS" />
</intent-filter>
</activity>
- <activity android:name="SoundAndDisplaySettings"
- android:label="@string/sound_and_display_settings_title"
+ <activity android:name="SoundSettings"
+ android:label="@string/sound_settings"
android:clearTaskOnLaunch="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.SOUND_SETTINGS" />
+ <action android:name="android.settings.SOUND_SETTINGS" />
+ <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="DisplaySettings"
+ android:label="@string/display_settings"
+ android:clearTaskOnLaunch="true"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.DISPLAY_SETTINGS" />
<action android:name="android.settings.DISPLAY_SETTINGS" />
- <action android:name="android.settings.SOUND_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<activity android:name="DeviceAdminSettings"
android:label="@string/device_admin_settings_title"
+ android:theme="@style/TallTitleBarTheme"
android:clearTaskOnLaunch="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
- <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
<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="DeviceAdminAdd"
+ android:label="@string/device_admin_add_title"
+ android:theme="@style/TallTitleBarTheme"
+ android:clearTaskOnLaunch="true"
+ >
+ <intent-filter>
+ <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </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="VoiceInputOutputSettings"
+ android:label="@string/voice_input_output_settings">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name="TextToSpeechSettings" android:label="@string/tts_settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
android:theme="@android:style/Theme.NoTitleBar">
</activity>
- <activity android:name="ChooseLockGeneric"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name="ChooseLockGeneric">
<intent-filter>
<action android:name="android.app.action.SET_NEW_PASSWORD" />
<category android:name="android.intent.category.DEFAULT" />
</activity>
<activity android:name="ChooseLockPattern"
- android:label="@string/lockpattern_change_lock_pattern_label">
+ android:label="@string/lockpattern_change_lock_pattern_label"
+ android:exported="false">
</activity>
<activity android:name="ChooseLockPassword"
android:label="@string/lockpattern_change_lock_pin_label"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="false">
</activity>
<activity android:name="ChooseLockPatternTutorial"
<intent-filter>
<action android:name="android.intent.action.DOCK_EVENT" />
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
+ <action android:name="android.bluetooth.headset.action.STATE_CHANGED" />
+ <action android:name="android.bluetooth.a2dp.action.SINK_STATE_CHANGED" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</receiver>
</intent-filter>
</activity>
- <activity android:name="SdCardSettings" android:label="@string/sd_card_settings_label">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
- <category android:name="android.intent.category.VOICE_LAUNCH" />
- </intent-filter>
- </activity>
-
<activity android:name="ProxySelector" android:label="@string/proxy_settings_label"
android:theme="@android:style/Theme.Dialog">
<intent-filter>