diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:49:15 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:49:15 -0800 |
| commit | 64e314b61e865919fc8c94165e42dfc5fb7b92f4 (patch) | |
| tree | abdadcbf11c325bdf7f79a1ba051043a82909211 /AndroidManifest.xml | |
| parent | 89ae71c089067d2cd6a3e7304f4126abb57ab9be (diff) | |
| parent | 46742e0cf933abfcf65be9009cd9262863280c34 (diff) | |
| download | packages_apps_Settings-64e314b61e865919fc8c94165e42dfc5fb7b92f4.zip packages_apps_Settings-64e314b61e865919fc8c94165e42dfc5fb7b92f4.tar.gz packages_apps_Settings-64e314b61e865919fc8c94165e42dfc5fb7b92f4.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD
Android 6.0.1 release 3
Change-Id: If54bacef03fc826fd02ca48db5ef3a25c8fc7127
Diffstat (limited to 'AndroidManifest.xml')
| -rwxr-xr-x | AndroidManifest.xml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fa13e90..e2138e0 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -685,7 +685,6 @@ android:excludeFromRecents="true"> <intent-filter android:priority="1"> <action android:name="com.android.settings.USER_DICTIONARY_INSERT" /> - <action android:name="com.android.settings.USER_DICTIONARY_EDIT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" @@ -1754,27 +1753,6 @@ <activity android:name=".AppPicker" android:label="@string/select_application" android:theme="@style/Theme.AppPicker" /> - <activity android:name="Settings$UsbSettingsActivity" - android:label="@string/storage_title_usb" - android:taskAffinity="com.android.settings" - android:parentActivityName="Settings$StorageSettingsActivity"> - <intent-filter android:priority="1"> - <action android:name="android.settings.STORAGE_USB_SETTINGS" /> - <action android:name="com.android.settings.STORAGE_USB_SETTINGS" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.deviceinfo.UsbSettings" /> - <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/storage_settings" /> - <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" - android:value="true" /> - </activity> - <!-- Keep compatibility with old shortcuts. --> <activity-alias android:name="UsbSettings" android:exported="true" |