<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settings"
+ coreApp="true"
android:sharedUserId="android.uid.system">
<original-package android:name="com.android.settings" />
android:value="com.android.settings.wifi.AdvancedWifiSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wifi_settings" />
+ <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+ android:resource="@string/wifi_settings" />
+ <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+ android:value="com.android.settings.Settings$WifiSettingsActivity" />
</activity>
<activity android:name=".wifi.WifiInfo"
</activity>
<activity android:name="Settings$TetherSettingsActivity"
+ android:label="@string/tether_settings_title_all"
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" />
+ <category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.TetherSettings" />
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
- <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />
<action android:name="android.settings.INPUT_METHOD_SETTINGS" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
android:clearTaskOnLaunch="true">
<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.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<activity android:name="CredentialStorage"
android:theme="@style/Transparent"
+ android:launchMode="singleTop"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="com.android.credentials.UNLOCK" />
</intent-filter>
</receiver>
- <receiver android:name=".bluetooth.BluetoothPermissionRequest">
+ <receiver android:name=".bluetooth.BluetoothPermissionRequest"
+ android:permission="android.permission.BLUETOOTH_ADMIN">
<intent-filter>
<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
</activity>
<!-- NFC settings -->
- <activity android:name="Settings$NfcSharingSettingsActivity"
- android:label="@string/zeroclick_settings_title"
+ <activity android:name="Settings$AndroidBeamSettingsActivity"
+ android:label="@string/android_beam_settings_title"
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
- <action android:name="android.settings.NFCSHARING_SETTINGS" />
+ <action android:name="android.settings.ANDROID_BEAM_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.nfc.ShareTap" />
+ android:value="com.android.settings.nfc.NdefPush" />
</activity>
<!-- Accessibility tutorial -->
android:immersive="true"
android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.NoActionBar"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:configChanges="mcc|mnc|keyboard|keyboardHidden|uiMode"
+ android:windowSoftInputMode="stateVisible|adjustResize">
<intent-filter android:priority="10">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.HOME" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DataUsageSummary" />