diff options
author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:44:28 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:44:28 -0800 |
commit | fd3290c133cf1266a35d64020b479f39ed74ba97 (patch) | |
tree | cd95add93665dc1a9a71ca48ffd83860e792e821 | |
parent | f2f2fc3c5af711b2c976b2e68277e3995c40f753 (diff) | |
parent | fbbdc9f61cea305cbba3830bad6397bf2ffb7587 (diff) | |
download | android_packages_wallpapers_LivePicker-fd3290c133cf1266a35d64020b479f39ed74ba97.tar.gz android_packages_wallpapers_LivePicker-fd3290c133cf1266a35d64020b479f39ed74ba97.tar.bz2 android_packages_wallpapers_LivePicker-fd3290c133cf1266a35d64020b479f39ed74ba97.zip |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/wallpapers/LivePicker into 1.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingcm-10.1
Android 4.2.2 release 1
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | res/drawable-hdpi/ic_launcher_live_wallpaper.png | bin | 6333 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_launcher_live_wallpaper.png | bin | 3259 -> 0 bytes | |||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_live_wallpaper.png | bin | 0 -> 6163 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_live_wallpaper.png | bin | 0 -> 3420 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_live_wallpaper.png | bin | 0 -> 9991 bytes | |||
-rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png | bin | 0 -> 17851 bytes |
7 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 709d5a9..9ce7e3e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,7 +29,7 @@ <application android:label="@string/application_name" - android:icon="@drawable/ic_launcher_live_wallpaper"> + android:icon="@mipmap/ic_launcher_live_wallpaper"> <activity android:name="LiveWallpaperActivity" android:label="@string/live_wallpaper_picker_label" diff --git a/res/drawable-hdpi/ic_launcher_live_wallpaper.png b/res/drawable-hdpi/ic_launcher_live_wallpaper.png Binary files differdeleted file mode 100644 index 6277411..0000000 --- a/res/drawable-hdpi/ic_launcher_live_wallpaper.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_launcher_live_wallpaper.png b/res/drawable-mdpi/ic_launcher_live_wallpaper.png Binary files differdeleted file mode 100644 index 6de7aaf..0000000 --- a/res/drawable-mdpi/ic_launcher_live_wallpaper.png +++ /dev/null diff --git a/res/mipmap-hdpi/ic_launcher_live_wallpaper.png b/res/mipmap-hdpi/ic_launcher_live_wallpaper.png Binary files differnew file mode 100644 index 0000000..e2a6978 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_live_wallpaper.png diff --git a/res/mipmap-mdpi/ic_launcher_live_wallpaper.png b/res/mipmap-mdpi/ic_launcher_live_wallpaper.png Binary files differnew file mode 100644 index 0000000..83d98c4 --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_live_wallpaper.png diff --git a/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png Binary files differnew file mode 100644 index 0000000..3f62ffb --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png diff --git a/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png Binary files differnew file mode 100644 index 0000000..b42c728 --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png |