diff options
author | Romain Guy <romainguy@android.com> | 2009-11-09 16:28:55 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-09 16:28:55 -0800 |
commit | b0fa1d2b99d674799c2627bf626847d1677883cd (patch) | |
tree | 77a154500ee952469efb980d807093d3fec5a8bd /res | |
parent | fddfe189604108b8874be907fd37e60aaf69d635 (diff) | |
parent | bc1a898dfb0138733efe835ae95528699af8a6af (diff) | |
download | android_packages_wallpapers_LivePicker-b0fa1d2b99d674799c2627bf626847d1677883cd.tar.gz android_packages_wallpapers_LivePicker-b0fa1d2b99d674799c2627bf626847d1677883cd.tar.bz2 android_packages_wallpapers_LivePicker-b0fa1d2b99d674799c2627bf626847d1677883cd.zip |
am bc1a898d: am 90e5569f: Improve live wallpaper picker: animations, loading message, etc.
Merge commit 'bc1a898dfb0138733efe835ae95528699af8a6af'
* commit 'bc1a898dfb0138733efe835ae95528699af8a6af':
Improve live wallpaper picker: animations, loading message, etc.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/live_wallpaper_loading.xml | 24 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 6 |
3 files changed, 32 insertions, 0 deletions
diff --git a/res/layout/live_wallpaper_loading.xml b/res/layout/live_wallpaper_loading.xml new file mode 100644 index 0000000..7dd375e --- /dev/null +++ b/res/layout/live_wallpaper_loading.xml @@ -0,0 +1,24 @@ +<?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. +--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + + android:gravity="center" + + android:text="@string/live_wallpaper_loading" + android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3df82f1..332f068 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -37,5 +37,7 @@ <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> + <!-- Message, tells the user the selected live wallpaper is loading. --> + <string name="live_wallpaper_loading">Loading live wallpaper...</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 82b1707..a55fbdb 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -27,4 +27,10 @@ <item name="android:textColor">#FFFFFFFF</item> <item name="android:gravity">left</item> </style> + + <style name="Preview" parent="@android:style/Theme.NoTitleBar"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item> + </style> </resources> |