summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2010-12-21 17:25:31 -0800
committerAdam Cohen <adamcohen@google.com>2010-12-21 17:29:40 -0800
commitd19ce7b07a0c897ce7bb4f439faae32de35fb437 (patch)
tree27774a239a7d7680c2ed8ef7d216ce607cb9fa22
parent6a5e9ca672bdaed170ee676284ae5ec0afeac1df (diff)
downloadandroid_packages_wallpapers_LivePicker-d19ce7b07a0c897ce7bb4f439faae32de35fb437.zip
android_packages_wallpapers_LivePicker-d19ce7b07a0c897ce7bb4f439faae32de35fb437.tar.gz
android_packages_wallpapers_LivePicker-d19ce7b07a0c897ce7bb4f439faae32de35fb437.tar.bz2
Adjusting dialog to spec
Change-Id: If739648a4e848ba75be6975e613a3d161f461339
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/layout-xlarge/live_wallpaper_base.xml4
-rw-r--r--res/layout-xlarge/live_wallpaper_entry.xml20
-rw-r--r--res/layout-xlarge/live_wallpaper_list.xml22
-rw-r--r--res/values-xlarge/dimensions.xml4
-rw-r--r--res/values/dimensions.xml2
-rw-r--r--res/values/strings.xml2
7 files changed, 38 insertions, 20 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a5d677..5688e7f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,14 +26,14 @@
<uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
<uses-permission android:name="android.permission.BIND_WALLPAPER" />
-
+
<application
android:label="@string/application_name"
android:icon="@drawable/ic_launcher_live_wallpaper">
<activity android:name="LiveWallpaperActivity"
android:icon="@drawable/ic_launcher_live_wallpaper"
- android:label="@string/live_wallpaper_picker_title"
+ android:label="@string/live_wallpaper_picker_label"
android:theme="@style/LivePickerTheme"
android:hardwareAccelerated="true">
<intent-filter>
diff --git a/res/layout-xlarge/live_wallpaper_base.xml b/res/layout-xlarge/live_wallpaper_base.xml
index a8e61d5..3c1888c 100644
--- a/res/layout-xlarge/live_wallpaper_base.xml
+++ b/res/layout-xlarge/live_wallpaper_base.xml
@@ -15,5 +15,5 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" /> \ No newline at end of file
diff --git a/res/layout-xlarge/live_wallpaper_entry.xml b/res/layout-xlarge/live_wallpaper_entry.xml
index eacb487..cecdf59 100644
--- a/res/layout-xlarge/live_wallpaper_entry.xml
+++ b/res/layout-xlarge/live_wallpaper_entry.xml
@@ -15,14 +15,14 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="@dimen/live_wallpaper_grid_item_height"
- android:padding="6dip">
+ android:padding="8dp">
<ImageView
android:id="@+id/thumbnail"
- android:layout_width="match_parent"
- android:layout_height="0dp"
+ android:layout_width="@dimen/live_wallpaper_grid_item_width"
+ android:layout_height="@dimen/live_wallpaper_grid_item_height"
android:layout_gravity="center"
android:layout_weight="1"
android:scaleType="centerCrop" />
@@ -33,7 +33,13 @@
android:layout_weight="0"
android:layout_gravity="center"
android:gravity="bottom"
- android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
- android:ellipsize="marquee" />
+ android:ellipsize="marquee"
+
+ android:textColor="#FFFFFFFF"
+ android:textSize="14sp"
+ android:shadowColor="#FF000000"
+ android:shadowDx="0.0"
+ android:shadowDy="1.0"
+ android:shadowRadius="1.0" />
</LinearLayout>
diff --git a/res/layout-xlarge/live_wallpaper_list.xml b/res/layout-xlarge/live_wallpaper_list.xml
index 312e672..49a1786 100644
--- a/res/layout-xlarge/live_wallpaper_list.xml
+++ b/res/layout-xlarge/live_wallpaper_list.xml
@@ -16,17 +16,22 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:paddingTop="24dp"
+ android:paddingBottom="24dp"
android:gravity="center">
<GridView
android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="400dp"
+ android:layout_width="702dp"
+ android:layout_height="wrap_content"
android:layout_gravity="center"
android:numColumns="3"
- android:stretchMode="spacingWidth"
+ android:stretchMode="none"
android:columnWidth="@dimen/live_wallpaper_grid_item_width"
- android:verticalSpacing="15dp"
+ android:verticalSpacing="0dp"
+ android:horizontalSpacing="0dp"
android:drawSelectorOnTop="false" />
<TextView
android:id="@android:id/empty"
@@ -37,5 +42,10 @@
android:visibility="gone"
android:text="@string/live_wallpaper_empty"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textColor="#FFFFFFFF"
+ android:textSize="14sp"
+ android:shadowColor="#FF000000"
+ android:shadowDx="0.0"
+ android:shadowDy="1.0"
+ android:shadowRadius="1.0" />
</FrameLayout> \ No newline at end of file
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index ebc69fc..b60f099 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -18,7 +18,7 @@
-->
<resources>
- <dimen name="live_wallpaper_grid_item_width">230dip</dimen>
- <dimen name="live_wallpaper_grid_item_height">185dip</dimen>
+ <dimen name="live_wallpaper_grid_item_width">224dip</dimen>
+ <dimen name="live_wallpaper_grid_item_height">192dip</dimen>
<dimen name="live_wallpaper_preview_button_width">200dip</dimen>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 8f19a71..89074de 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -22,6 +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="dialog_content_inset">0dip</dimen>
<dimen name="live_wallpaper_preview_button_width">160dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cab49ce..c90767f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,6 +25,8 @@
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
<string name="live_wallpaper_picker_title">Select live wallpaper</string>
+ <!-- Label for the live wallpaper picker. -->
+ <string name="live_wallpaper_picker_label">Live Wallpapers</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 -->