summaryrefslogtreecommitdiffstats
path: root/overlay
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-04-20 10:17:03 -0700
committerDianne Hackborn <hackbod@google.com>2011-04-20 10:23:53 -0700
commitcc747b1b169d45fd4f5c236f2354ae69c02ac86c (patch)
treec92fb3068bb0db717550320889971367779d9f60 /overlay
parent95aa7880a9a4d52587f59ffde14e7d6c0949536b (diff)
downloaddevice_samsung_crespo-cc747b1b169d45fd4f5c236f2354ae69c02ac86c.zip
device_samsung_crespo-cc747b1b169d45fd4f5c236f2354ae69c02ac86c.tar.gz
device_samsung_crespo-cc747b1b169d45fd4f5c236f2354ae69c02ac86c.tar.bz2
Integrate over changes from GB.
Change-Id: Id63f92efe3a750fea84da7de2929e613c252a92e
Diffstat (limited to 'overlay')
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml6
-rw-r--r--overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpgbin0 -> 154313 bytes
-rw-r--r--overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpgbin0 -> 8190 bytes
-rw-r--r--overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml1
4 files changed, 3 insertions, 4 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f22ce04..05090fd 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -88,10 +88,8 @@
</integer-array>
<!-- Component name of the default wallpaper. This will be ImageWallpaper if not
- specified.
- com.android.wallpaper/.nexus.NexusWallpaper
- -->
- <string name="default_wallpaper_component">@null</string>
+ specified -->
+ <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
<integer name="config_deskDockKeepsScreenOn">0</integer>
<integer name="config_carDockKeepsScreenOn">1</integer>
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg
new file mode 100644
index 0000000..f4a3934
--- /dev/null
+++ b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg
Binary files differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg
new file mode 100644
index 0000000..d580182
--- /dev/null
+++ b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg
Binary files differ
diff --git a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
index 6d3ec8d..40033cf 100644
--- a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
+++ b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
@@ -31,5 +31,6 @@
<item>wallpaper_mountains</item>
<item>wallpaper_sunset</item>
<item>wallpaper_goldengate</item>
+ <item>wallpaper_shuttle</item>
</string-array>
</resources>