From 104c45677660586026a7e74ef8c47d396403d50e Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 8 Jul 2013 18:03:46 -0700
Subject: Initial implementation of new wallpaper picker.

Change-Id: Ib4c5ac4989b4959fa62465d9cde3cac662e24949
---
 res/values/dimens.xml  |  4 ++++
 res/values/strings.xml |  4 +++-
 res/values/styles.xml  | 10 +++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6e2448147..e557c3e35 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,6 +21,10 @@
     <dimen name="dynamic_grid_search_bar_height">48dp</dimen>
     <dimen name="dynamic_grid_page_indicator_height">24dp</dimen>
 
+<!-- Wallpaper picker -->
+    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
+    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
+
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
     <dimen name="folderClingMarginTop">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 51da40be5..7b97889ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -30,8 +30,10 @@
     <string name="folder_name"></string>
     <!-- Title of dialog that appears after user selects Wallpaper from menu -->
     <string name="chooser_wallpaper">Choose wallpaper from</string>
-    <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
+    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
     <string name="wallpaper_instructions">Set wallpaper</string>
+    <!-- Label on button in Wallpaper Picker that launches Gallery app -->
+    <string name="gallery">Gallery</string>
     <!-- Option in "Select wallpaper from" dialog box -->
     <string name="pick_wallpaper">Wallpapers</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9f5ade487..f41c8eba8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,7 +18,15 @@
 -->
 
 <resources>
-    <style name="Theme.WallpaperPicker" parent="@android:style/Theme.Holo.NoActionBar">
+    <style name="Theme.WallpaperPicker" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/WallpaperPickerActionBar</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBarOverlay">true</item>
+    </style>
+
+    <style name="WallpaperPickerActionBar" parent="android:style/Widget.Holo.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
     </style>
 
     <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
-- 
cgit v1.2.3