Merge "fix quick control rendering" into honeycomb-mr1

7 files changed, 4 insertions, 71 deletions

diff --git a/res/drawable-mdpi/pie_bg_selected.png b/res/drawable-mdpi/pie_bg_selected.png
deleted file mode 100644
index 787984a..0000000
--- a/res/drawable-mdpi/pie_bg_selected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/qc_background_normal.png b/res/drawable-mdpi/qc_background_normal.png
index 947722d..b9a16d1 100644
--- a/res/drawable-mdpi/qc_background_normal.png
+++ b/res/drawable-mdpi/qc_background_normal.png
diff --git a/res/drawable-mdpi/qc_background_selected.png b/res/drawable-mdpi/qc_background_selected.png
deleted file mode 100644
index c0a6efc..0000000
--- a/res/drawable-mdpi/qc_background_selected.png
+++ /dev/null
diff --git a/res/drawable/item_background_holo_dark.xm b/res/drawable/item_background_holo_dark.xm
deleted file mode 100644
index d5fa3c0..0000000
--- 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 77f8023..0000000
--- 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>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 73daa07..6a7c578 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,4 +34,6 @@
     <color name="tabFaviconBackground">#FF555555</color>
     <color name="tabFocusHighlight">#FF99CC00</color>
     <color name="qcMenuBackground">#C0000000</color>
+    <color name="qc_normal">#C02447B2</color>
+    <color name="qc_selected">#D0102052</color>
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index e92828e..99eb43e 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -31,8 +31,9 @@
     <dimen name="favicon_size">16dip</dimen>
     <dimen name="favicon_padded_size">20dip</dimen>
     <dimen name="qc_radius_start">50dip</dimen>
-    <dimen name="qc_radius_increment">60dip</dimen>
+    <dimen name="qc_radius_increment">70dip</dimen>
     <dimen name="qc_slop">15dip</dimen>
+    <dimen name="qc_touch_offset">15dip</dimen>
     <dimen name="qc_tab_title_height">30dip</dimen>
     <dimen name="qc_thumb_width">240dip</dimen>
     <dimen name="qc_thumb_height">160dip</dimen>