diff options
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | res/drawable-hdpi/ic_launcher_wallpaper.png | bin | 4034 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_launcher_wallpaper.png | bin | 2850 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_launcher_wallpaper.png | bin | 7201 -> 0 bytes | |||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_home.png (renamed from res/drawable-hdpi/ic_launcher_home.png) | bin | 4048 -> 4048 bytes | |||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_wallpaper.png | bin | 0 -> 4418 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_home.png (renamed from res/drawable-mdpi/ic_launcher_home.png) | bin | 3116 -> 3116 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_wallpaper.png | bin | 0 -> 2871 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_home.png (renamed from res/drawable-xhdpi/ic_launcher_home.png) | bin | 7810 -> 7810 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_wallpaper.png | bin | 0 -> 6061 bytes | |||
-rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_wallpaper.png | bin | 0 -> 7596 bytes | |||
-rw-r--r-- | src/com/android/launcher2/AddAdapter.java | 2 |
12 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index adb6ef352..c14b63ed8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -64,7 +64,7 @@ <application android:name="com.android.launcher2.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.android.launcher2.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> diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png Binary files differdeleted file mode 100644 index 5c8ee24bb..000000000 --- a/res/drawable-hdpi/ic_launcher_wallpaper.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_launcher_wallpaper.png b/res/drawable-mdpi/ic_launcher_wallpaper.png Binary files differdeleted file mode 100644 index d2803b1ca..000000000 --- a/res/drawable-mdpi/ic_launcher_wallpaper.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_wallpaper.png b/res/drawable-xhdpi/ic_launcher_wallpaper.png Binary files differdeleted file mode 100644 index 9b0b7b2bc..000000000 --- a/res/drawable-xhdpi/ic_launcher_wallpaper.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png Binary files differindex 8945ada34..8945ada34 100644 --- a/res/drawable-hdpi/ic_launcher_home.png +++ b/res/mipmap-hdpi/ic_launcher_home.png diff --git a/res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png Binary files differnew file mode 100644 index 000000000..affee851d --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_wallpaper.png diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png Binary files differindex 72bd80a2f..72bd80a2f 100644 --- a/res/drawable-mdpi/ic_launcher_home.png +++ b/res/mipmap-mdpi/ic_launcher_home.png diff --git a/res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png Binary files differnew file mode 100644 index 000000000..cb4443bdb --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_wallpaper.png diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png Binary files differindex 7bef13ca7..7bef13ca7 100644 --- a/res/drawable-xhdpi/ic_launcher_home.png +++ b/res/mipmap-xhdpi/ic_launcher_home.png diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png Binary files differnew file mode 100644 index 000000000..60f8dceec --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_wallpaper.png diff --git a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png Binary files differnew file mode 100644 index 000000000..023fb5886 --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/android/launcher2/AddAdapter.java index c2a424b00..c0bb17b72 100644 --- a/src/com/android/launcher2/AddAdapter.java +++ b/src/com/android/launcher2/AddAdapter.java @@ -71,7 +71,7 @@ public class AddAdapter extends BaseAdapter { Resources res = launcher.getResources(); mItems.add(new ListItem(res, R.string.group_wallpapers, - R.drawable.ic_launcher_wallpaper, ITEM_WALLPAPER)); + R.mipmap.ic_launcher_wallpaper, ITEM_WALLPAPER)); } public View getView(int position, View convertView, ViewGroup parent) { |