summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-11-08 13:51:50 -0800
committerRomain Guy <romainguy@android.com>2009-11-08 15:30:12 -0800
commit2f26cced2d4257c4fb106939447d901ae971b4d1 (patch)
treeb78f744b31f42fc53274593d2a5883a2258d50b8 /res
parent7e2a10d904ce52bde6e887b9c257709729f39613 (diff)
downloadandroid_packages_wallpapers_LivePicker-2f26cced2d4257c4fb106939447d901ae971b4d1.zip
android_packages_wallpapers_LivePicker-2f26cced2d4257c4fb106939447d901ae971b4d1.tar.gz
android_packages_wallpapers_LivePicker-2f26cced2d4257c4fb106939447d901ae971b4d1.tar.bz2
New, safer, live wallpaper picker.
Diffstat (limited to 'res')
-rw-r--r--res/layout/live_wallpaper_content.xml103
-rw-r--r--res/layout/live_wallpaper_entry.xml66
-rw-r--r--res/layout/live_wallpaper_list.xml38
-rw-r--r--res/layout/live_wallpaper_preview.xml45
-rw-r--r--res/layout/wallpaper_item.xml22
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimensions.xml25
-rw-r--r--res/values/strings.xml8
8 files changed, 182 insertions, 128 deletions
diff --git a/res/layout/live_wallpaper_content.xml b/res/layout/live_wallpaper_content.xml
deleted file mode 100644
index 3809a35..0000000
--- a/res/layout/live_wallpaper_content.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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="fill_parent"
- android:layout_height="fill_parent"
- >
-
- <RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dip"
- android:layout_marginLeft="6dip"
- >
- <TextView android:id="@+id/title"
- style="@style/WallpaperTitle"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/author"
- style="@style/WallpaperTitle"
- android:layout_below="@id/title"
- android:textSize="14dip"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dip"
- />
- <TextView android:id="@+id/synopsis"
- style="@style/WallpaperTitle"
- android:layout_below="@id/author"
- android:textSize="14dip"
- android:ems="15"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dip"
- />
- </RelativeLayout>
-
- <FrameLayout
- android:layout_width="fill_parent"
- android:layout_height="0px"
- android:layout_weight="1"
- >
- <!--
- <ListView
- android:id="@android:id/list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- />
- -->
- <TextView
- android:id="@android:id/empty"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:gravity="center"
- android:text="@string/live_wallpaper_empty"
- android:visibility="gone"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
- </FrameLayout>
-
- <Gallery android:id="@+id/gallery"
- android:gravity="fill"
- android:layout_width="fill_parent"
- android:layout_height="120dip" />
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/set"
- android:layout_width="160dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/wallpaper_instructions"
- android:layout_gravity="center" />
-
- <Button android:id="@+id/configure"
- android:layout_width="160dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/configure_wallpaper"
- android:layout_gravity="center" />
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
new file mode 100644
index 0000000..29be991
--- /dev/null
+++ b/res/layout/live_wallpaper_entry.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:paddingLeft="4dip"
+ android:minHeight="?android:attr/listPreferredItemHeight">
+
+ <ImageView
+ android:id="@+id/thumbnail"
+
+ android:layout_width="@dimen/live_wallpaper_thumbnail_width"
+ android:layout_height="@dimen/live_wallpaper_thumbnail_width"
+
+ android:layout_gravity="center_vertical"
+
+ android:scaleType="fitCenter" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+
+ android:layout_marginLeft="8dip"
+ android:layout_gravity="center_vertical"
+
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/title_author"
+
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:textAppearance="?android:attr/textAppearanceMedium"
+
+ android:singleLine="true"
+ android:ellipsize="marquee" />
+
+ <TextView
+ android:id="@+id/description"
+
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:textAppearance="?android:attr/textAppearanceSmall"
+
+ android:maxLines="3" />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml
new file mode 100644
index 0000000..bab79ff
--- /dev/null
+++ b/res/layout/live_wallpaper_list.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <ListView
+ android:id="@android:id/list"
+
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+
+ android:drawSelectorOnTop="false" />
+
+ <TextView
+ android:id="@android:id/empty"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+
+ android:gravity="center"
+ android:visibility="gone"
+
+ android:text="@string/live_wallpaper_empty"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</merge> \ No newline at end of file
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml
new file mode 100644
index 0000000..d5da853
--- /dev/null
+++ b/res/layout/live_wallpaper_preview.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+
+ android:layout_gravity="center_horizontal|bottom"
+
+ android:paddingBottom="4dip">
+
+ <Button
+ android:layout_width="160dip"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+
+ android:text="@string/wallpaper_instructions"
+
+ android:onClick="setLiveWallpaper" />
+
+ <Button
+ android:id="@+id/configure"
+
+ android:layout_width="160dip"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+
+ android:text="@string/configure_wallpaper"
+
+ android:onClick="configureLiveWallpaper" />
+
+</LinearLayout>
diff --git a/res/layout/wallpaper_item.xml b/res/layout/wallpaper_item.xml
deleted file mode 100644
index 6727483..0000000
--- a/res/layout/wallpaper_item.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:background="?android:attr/galleryItemBackground"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:focusable="true" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 90d633a..d49e104 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,6 +18,7 @@
-->
<resources>
- <color name="bubble_dark_background">#B2191919</color>
+ <color name="live_wallpaper_thumbnail_background">#CC666666</color>
+ <color name="live_wallpaper_thumbnail_text_color">#FFFFFFFF</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
new file mode 100644
index 0000000..080a55a
--- /dev/null
+++ b/res/values/dimensions.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* copyright (c) 2008 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_text_size">14dip</dimen>
+ <dimen name="live_wallpaper_thumbnail_text_offset">12dip</dimen>
+ <dimen name="live_wallpaper_thumbnail_width">100dip</dimen>
+ <dimen name="live_wallpaper_thumbnail_height">79dip</dimen>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 190bb19..3df82f1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,7 +24,9 @@
<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 wallpaper</string>
+ <string name="live_wallpaper_picker_title">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 -->
<string name="configure_wallpaper">Settingsā€¦</string>
<!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
@@ -33,5 +35,7 @@
<string name="live_wallpaper_empty">No live wallpapers.</string>
<!-- Button label, action, sets the currently selected wallpaper. -->
<string name="set_live_wallpaper">Set wallpaper</string>
-
+ <!-- Label, title and author of the live wallpaper -->
+ <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>
+
</resources>