diff options
author | Romain Guy <romainguy@android.com> | 2009-11-03 18:38:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-03 18:38:35 -0800 |
commit | 155e79991c7f52efa15e456628a17c21c0738fb5 (patch) | |
tree | 509800f2888d08fb3d788ecb23ba624bbcb30d85 /res | |
parent | 53c31c2a72b3d5387719709b36b29862d32ef049 (diff) | |
parent | 02d03b0212e69dc08814b6f81e3bd3d819316013 (diff) | |
download | android_packages_wallpapers_LivePicker-155e79991c7f52efa15e456628a17c21c0738fb5.tar.gz android_packages_wallpapers_LivePicker-155e79991c7f52efa15e456628a17c21c0738fb5.tar.bz2 android_packages_wallpapers_LivePicker-155e79991c7f52efa15e456628a17c21c0738fb5.zip |
am 02d03b02: Do not allow the selection of the live wallpaper title.
Merge commit '02d03b0212e69dc08814b6f81e3bd3d819316013' into eclair-mr2
* commit '02d03b0212e69dc08814b6f81e3bd3d819316013':
Do not allow the selection of the live wallpaper title.
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/focused_application_background.9.png | bin | 1454 -> 0 bytes | |||
-rw-r--r-- | res/drawable/shortcut_selector.xml | 24 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
3 files changed, 0 insertions, 26 deletions
diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png Binary files differdeleted file mode 100644 index 7bf37ef..0000000 --- a/res/drawable-hdpi/focused_application_background.9.png +++ /dev/null diff --git a/res/drawable/shortcut_selector.xml b/res/drawable/shortcut_selector.xml deleted file mode 100644 index 09fec1b..0000000 --- a/res/drawable/shortcut_selector.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2007, 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. -*/ ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/focused_application_background" /> - <item android:state_window_focused="false" android:state_focused="true" android:drawable="@android:color/transparent" /> -</selector> diff --git a/res/values/styles.xml b/res/values/styles.xml index 088b473..6e67ae0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,11 +28,9 @@ <item name="android:gravity">center_horizontal</item> <item name="android:layout_width">fill_parent</item> <item name="android:layout_height">fill_parent</item> - <item name="android:background">@drawable/shortcut_selector</item> <item name="android:paddingTop">4dip</item> <item name="android:paddingBottom">4dip</item> <item name="android:paddingLeft">8dip</item> <item name="android:paddingRight">8dip</item> </style> </resources> - |