summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-03-16 16:35:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-16 16:35:08 -0700
commitcd86a0e938c9d442995b21da52567f8ca0be2713 (patch)
tree8993f2d11dab8a89d02f58af16599572f20043dd /res/drawable
parent9d9a4813b86a3cc96d3f381c61b47a9e8897344b (diff)
parentb0ebbd0058d62a6e76ef7ae66cbe0297be38425e (diff)
downloadandroid_packages_apps_Gello-cd86a0e938c9d442995b21da52567f8ca0be2713.tar.gz
android_packages_apps_Gello-cd86a0e938c9d442995b21da52567f8ca0be2713.tar.bz2
android_packages_apps_Gello-cd86a0e938c9d442995b21da52567f8ca0be2713.zip
am b0ebbd00: Merge "fix quick control rendering" into honeycomb-mr1
* commit 'b0ebbd0058d62a6e76ef7ae66cbe0297be38425e': fix quick control rendering
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/item_background_holo_dark.xm49
-rw-r--r--res/drawable/qc_item_selector.xml21
2 files changed, 0 insertions, 70 deletions
diff --git a/res/drawable/item_background_holo_dark.xm b/res/drawable/item_background_holo_dark.xm
deleted file mode 100644
index d5fa3c00..00000000
--- a/res/drawable/item_background_holo_dark.xm
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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"
- android:exitFadeDuration="@android:integer/config_mediumAnimTime">
- <item
- android:state_window_focused="false"
- android:drawable="@color/transparent" />
- <!--
- Even though these two point to the same resource, have two states so the
- drawable will invalidate itself when coming out of pressed state.
- -->
- <item
- android:state_focused="true"
- android:state_enabled="false"
- android:state_pressed="true"
- android:drawable="@drawable/list_selector_disabled_holo_dark" />
- <item
- android:state_focused="true"
- android:state_enabled="false"
- android:drawable="@drawable/list_selector_disabled_holo_dark" />
- <item
- android:state_focused="true"
- android:state_pressed="true"
- android:drawable="@drawable/list_selector_background_transition_holo_dark" />
- <item
- android:state_focused="false"
- android:state_pressed="true"
- android:drawable="@drawable/list_selector_background_transition_holo_dark" />
- <item
- android:state_focused="true"
- android:drawable="@drawable/list_focused_holo" />
- <item
- android:drawable="@color/transparent" />
-</selector> \ No newline at end of file
diff --git a/res/drawable/qc_item_selector.xml b/res/drawable/qc_item_selector.xml
deleted file mode 100644
index 77f80234..00000000
--- a/res/drawable/qc_item_selector.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true"
- android:drawable="@drawable/pie_bg_selected" />
- <item android:state_selected="false" android:drawable="@drawable/clear" />
-</selector>