diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-05-20 17:23:19 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-05-20 17:23:19 -0700 |
| commit | 5bc1b815f243a78ae35364b2dcec7820ea80013b (patch) | |
| tree | 729a1763a830dd97d2bcdb66235a4bb701d0c67a /AndroidManifest.xml | |
| parent | 46c118a3dba721724f5c819f535d0d410d7c6185 (diff) | |
| parent | 0b4362157fdc930f0eb342194dfb553c80a238bd (diff) | |
| download | android_packages_apps_Trebuchet-5bc1b815f243a78ae35364b2dcec7820ea80013b.tar.gz android_packages_apps_Trebuchet-5bc1b815f243a78ae35364b2dcec7820ea80013b.tar.bz2 android_packages_apps_Trebuchet-5bc1b815f243a78ae35364b2dcec7820ea80013b.zip | |
Merge remote-tracking branch 'github/cm-11.0' into HEAD
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 95e6f7fb9..ba7c8b4a7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -34,13 +34,13 @@ <permission android:name="com.android.launcher3.permission.READ_SETTINGS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="normal" + android:protectionLevel="dangerous" android:label="@string/permlab_read_settings" android:description="@string/permdesc_read_settings"/> <permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="normal" + android:protectionLevel="dangerous" android:label="@string/permlab_write_settings" android:description="@string/permdesc_write_settings"/> @@ -117,46 +117,6 @@ </intent-filter> </activity> - <activity - android:name="com.android.launcher3.LockWallpaperPickerActivity" - android:theme="@style/Theme.WallpaperCropper" - android:label="@string/pick_wallpaper" - android:icon="@mipmap/ic_launcher_wallpaper" - android:finishOnCloseSystemDialogs="true" - android:process=":wallpaper_chooser"> - <intent-filter> - <action android:name="android.intent.action.SET_KEYGUARD_WALLPAPER" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - </activity> - - <activity - android:name="com.android.launcher3.WallpaperPickerActivity" - android:theme="@style/Theme.WallpaperCropper" - android:label="@string/pick_wallpaper" - android:icon="@mipmap/ic_launcher_wallpaper" - android:finishOnCloseSystemDialogs="true" - android:process=":wallpaper_chooser"> - <intent-filter> - <action android:name="android.intent.action.SET_WALLPAPER" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - </activity> - - <activity - android:name="com.android.launcher3.WallpaperCropActivity" - android:theme="@style/Theme.WallpaperCropper" - android:label="@string/crop_wallpaper" - android:icon="@mipmap/ic_launcher_wallpaper" - android:finishOnCloseSystemDialogs="true" - android:process=":wallpaper_chooser"> - <intent-filter> - <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="image/*" /> - </intent-filter> - </activity> - <!-- Debugging tools --> <activity android:name="com.android.launcher3.MemoryDumpActivity" |