From 494767f1f8a29d2197837463fb6477646e682478 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Wed, 1 Dec 2010 17:00:10 -0800
Subject: Updated the LivePicker for tablet UI

- Basic UI for the new LivePicker. Missing small tweaks

Change-Id: I5d48e5ea5afc7feccf5f35124b944283060685df
---
 res/layout-xlarge/live_wallpaper_entry.xml | 38 +++++++++++++++++++++++++++
 res/layout-xlarge/live_wallpaper_list.xml  | 41 ++++++++++++++++++++++++++++++
 res/layout/live_wallpaper_base.xml         | 20 +++++++++++++++
 res/layout/live_wallpaper_entry.xml        |  4 +--
 res/layout/live_wallpaper_list.xml         |  8 +++---
 res/layout/live_wallpaper_preview.xml      |  5 ++--
 res/values-xlarge/dimensions.xml           | 25 ++++++++++++++++++
 res/values-xlarge/styles.xml               | 22 ++++++++++++++++
 res/values/dimensions.xml                  |  2 ++
 res/values/strings.xml                     |  4 ++-
 res/values/styles.xml                      |  7 ++++-
 11 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 res/layout-xlarge/live_wallpaper_entry.xml
 create mode 100644 res/layout-xlarge/live_wallpaper_list.xml
 create mode 100644 res/layout/live_wallpaper_base.xml
 create mode 100644 res/values-xlarge/dimensions.xml
 create mode 100644 res/values-xlarge/styles.xml

(limited to 'res')

diff --git a/res/layout-xlarge/live_wallpaper_entry.xml b/res/layout-xlarge/live_wallpaper_entry.xml
new file mode 100644
index 0000000..b2515a7
--- /dev/null
+++ b/res/layout-xlarge/live_wallpaper_entry.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/live_wallpaper_grid_item_height"
+    android:padding="6dip">
+    <ImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="@dimen/live_wallpaper_thumbnail_width"
+        android:layout_height="@dimen/live_wallpaper_thumbnail_height"
+        android:layout_gravity="center"
+        android:scaleType="centerCrop" />
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="@dimen/live_wallpaper_thumbnail_width"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:layout_gravity="center"
+        android:gravity="bottom"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:singleLine="true"
+        android:ellipsize="marquee" />
+</LinearLayout>
diff --git a/res/layout-xlarge/live_wallpaper_list.xml b/res/layout-xlarge/live_wallpaper_list.xml
new file mode 100644
index 0000000..50d99a7
--- /dev/null
+++ b/res/layout-xlarge/live_wallpaper_list.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:gravity="center">
+    <GridView
+        android:id="@android:id/list"
+        android:layout_width="800dp"
+        android:layout_height="400dp"
+        android:layout_gravity="center"
+        android:numColumns="3"
+        android:stretchMode="columnWidth"
+        android:horizontalSpacing="15dp"
+        android:verticalSpacing="15dp"
+        android:drawSelectorOnTop="false" />
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        android:gravity="center"
+        android:visibility="gone"
+
+        android:text="@string/live_wallpaper_empty"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml
new file mode 100644
index 0000000..6803901
--- /dev/null
+++ b/res/layout/live_wallpaper_base.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/live_wallpaper_base_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
index cce484f..b39cefb 100644
--- a/res/layout/live_wallpaper_entry.xml
+++ b/res/layout/live_wallpaper_entry.xml
@@ -29,7 +29,7 @@
         android:id="@+id/thumbnail"
 
         android:layout_width="@dimen/live_wallpaper_thumbnail_width"
-        android:layout_height="@dimen/live_wallpaper_thumbnail_width"
+        android:layout_height="@dimen/live_wallpaper_thumbnail_height"
 
         android:layout_gravity="center_vertical"
 
@@ -47,7 +47,7 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/title_author"
+            android:id="@+id/title"
 
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml
index 9ac8c66..a3c22bb 100644
--- a/res/layout/live_wallpaper_list.xml
+++ b/res/layout/live_wallpaper_list.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <ListView 
         android:id="@android:id/list"
     
@@ -34,5 +35,4 @@
 
         android:text="@string/live_wallpaper_empty"
         android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</merge>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml
index d5da853..38cc2ac 100644
--- a/res/layout/live_wallpaper_preview.xml
+++ b/res/layout/live_wallpaper_preview.xml
@@ -23,7 +23,7 @@
     android:paddingBottom="4dip">
 
     <Button
-        android:layout_width="160dip"
+        android:layout_width="@dimen/live_wallpaper_preview_button_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
 
@@ -34,12 +34,11 @@
     <Button
         android:id="@+id/configure"
 
-        android:layout_width="160dip"
+        android:layout_width="@dimen/live_wallpaper_preview_button_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
 
         android:text="@string/configure_wallpaper"
 
         android:onClick="configureLiveWallpaper" />
-	
 </LinearLayout>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
new file mode 100644
index 0000000..f8c1966
--- /dev/null
+++ b/res/values-xlarge/dimensions.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* copyright (c) 2010 the android open source project
+*
+* licensed under the apache license, version 2.0 (the "license");
+* you may not use this file except in compliance with the license.
+* you may obtain a copy of the license at
+*
+*      http://www.apache.org/licenses/license-2.0
+*
+* unless required by applicable law or agreed to in writing, software
+* distributed under the license is distributed on an "as is" basis,
+* without warranties or conditions of any kind, either express or implied.
+* see the license for the specific language governing permissions and
+* limitations under the license.
+*/
+-->
+
+<resources>
+    <dimen name="live_wallpaper_thumbnail_width">200dip</dimen>
+    <dimen name="live_wallpaper_thumbnail_height">145dip</dimen>
+    <dimen name="live_wallpaper_grid_item_height">185dip</dimen>
+    <dimen name="live_wallpaper_preview_button_width">200dip</dimen>
+</resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
new file mode 100644
index 0000000..5338119
--- /dev/null
+++ b/res/values-xlarge/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2010 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="LivePickerTheme" parent="android:Theme.Holo.Dialog.NoFrame" />
+</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index d0ee3a6..8f19a71 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -22,4 +22,6 @@
     <dimen name="live_wallpaper_thumbnail_text_offset">12dip</dimen>
     <dimen name="live_wallpaper_thumbnail_width">75dip</dimen>
     <dimen name="live_wallpaper_thumbnail_height">75dip</dimen>
+    <dimen name="dialog_content_inset">15dip</dimen>
+    <dimen name="live_wallpaper_preview_button_width">160dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c070c61..cab49ce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="application_name">Live Wallpaper Picker</string>
     <!-- Title for the screen that lets the user choose a live wallpaper to use
          for the system. -->
-    <string name="live_wallpaper_picker_title">Live wallpapers</string>
+    <string name="live_wallpaper_picker_title">Select live wallpaper</string>
     <!-- Title for the screen that lets the user preview a live wallpaper. -->
     <string name="live_wallpaper_preview_title">Live wallpaper preview</string>
     <!-- List item for configuring the current wallpaper -->
@@ -39,5 +39,7 @@
     <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> by <xliff:g id="author" example="Google">%2$s</xliff:g></string>
     <!-- Message, tells the user the selected live wallpaper is loading. -->
     <string name="live_wallpaper_loading">Loading live wallpaper…</string>
+    <!-- Button label, action, cancels the wallpaper picker dialog [CHAR_LIMIT=40]-->
+    <string name="wallpaper_cancel">Cancel</string>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a55fbdb..8684f16 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -28,9 +28,14 @@
         <item name="android:gravity">left</item>
     </style>
     
-    <style name="Preview" parent="@android:style/Theme.NoTitleBar">
+    <style name="Preview" parent="android:Theme.Holo">
+        <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
     </style>
+
+    <style name="LivePickerTheme" parent="android:style/Theme.Holo">
+        <item name="android:windowNoTitle">true</item>
+    </style>
 </resources>
-- 
cgit v1.2.3