diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:45:54 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:45:54 -0800 |
| commit | ed1816e3a828046439da5cb31a65af4641be9076 (patch) | |
| tree | 994e4ed51b3e1630e338b3ec255a8f4dce429953 /AndroidManifest.xml | |
| parent | c43d6eebe95dcabcb4ded1c4da8c6cc21d2514f5 (diff) | |
| parent | 002c25eede2a33a5378c16c5bb9165179783e729 (diff) | |
| download | android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.gz android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.bz2 android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Launcher2 into treb
Android 4.2.2 release 1
Conflicts:
res/layout-land/launcher.xml
res/layout-port/launcher.xml
res/layout-sw720dp/launcher.xml
src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/CellLayout.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/PagedView.java
Change-Id: I415138430337bcd21070b815a80de9c0cdd52239
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f9271e4e7..78e4db744 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -65,7 +65,7 @@ <application android:name="com.cyanogenmod.trebuchet.LauncherApplication" android:label="@string/application_name" - android:icon="@drawable/ic_launcher_home" + android:icon="@mipmap/ic_launcher_home" android:hardwareAccelerated="true" android:largeHeap="@bool/config_largeHeap" android:supportsRtl="true"> @@ -88,7 +88,7 @@ android:name="com.cyanogenmod.trebuchet.WallpaperChooser" android:theme="@style/Theme.WallpaperPicker" android:label="@string/pick_wallpaper" - android:icon="@drawable/ic_launcher_wallpaper" + android:icon="@mipmap/ic_launcher_wallpaper" android:finishOnCloseSystemDialogs="true" android:process=":wallpaper_chooser"> <intent-filter> |