summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-03-07 15:26:33 -0800
committerMichael Kolb <kolby@google.com>2011-03-08 13:10:08 -0800
commit0860d99a463f7645bcc9aaa246fd8852e90dbb5d (patch)
treeed62e02e453f1a633aacb1053c5de48d27e48cfc /res
parent448461d9b7e8824a68a2994f490bb142c9f9b77a (diff)
downloadpackages_apps_Browser-0860d99a463f7645bcc9aaa246fd8852e90dbb5d.zip
packages_apps_Browser-0860d99a463f7645bcc9aaa246fd8852e90dbb5d.tar.gz
packages_apps_Browser-0860d99a463f7645bcc9aaa246fd8852e90dbb5d.tar.bz2
qc refactor part1
Bug: 4052266 change QuickControl rendering (removes all path calculations) change pie to allow several levels of items Change-Id: I52254745eadf956da83d963e23c1ba07946f53a7
Diffstat (limited to 'res')
-rw-r--r--res/drawable-mdpi/pie_bg_selected.pngbin0 -> 1351 bytes
-rw-r--r--res/drawable-mdpi/qc_background_normal.pngbin12095 -> 59066 bytes
-rw-r--r--res/drawable/qc_item_selector.xml21
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimensions.xml5
5 files changed, 25 insertions, 4 deletions
diff --git a/res/drawable-mdpi/pie_bg_selected.png b/res/drawable-mdpi/pie_bg_selected.png
new file mode 100644
index 0000000..787984a
--- /dev/null
+++ b/res/drawable-mdpi/pie_bg_selected.png
Binary files differ
diff --git a/res/drawable-mdpi/qc_background_normal.png b/res/drawable-mdpi/qc_background_normal.png
index 539b45d..947722d 100644
--- a/res/drawable-mdpi/qc_background_normal.png
+++ b/res/drawable-mdpi/qc_background_normal.png
Binary files differ
diff --git a/res/drawable/qc_item_selector.xml b/res/drawable/qc_item_selector.xml
new file mode 100644
index 0000000..77f8023
--- /dev/null
+++ b/res/drawable/qc_item_selector.xml
@@ -0,0 +1,21 @@
+<?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 6fa0840..73daa07 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,10 +29,9 @@
<color name="bookmarkWidgetDivider">#383847</color>
<color name="bookmarkWidgetItemBackground">#2b2b3c</color>
<color name="bookmarkWidgetFolderBackground">#A0383847</color>
- <color name="qc_slice_normal">#E0A0A0A0</color>
- <color name="qc_slice_active">#E02090FF</color>
<color name="bookmarkWidgetFaviconBackground">#23ffffff</color>
<color name="bookmarkListFaviconBackground">#23ffffff</color>
<color name="tabFaviconBackground">#FF555555</color>
<color name="tabFocusHighlight">#FF99CC00</color>
+ <color name="qcMenuBackground">#C0000000</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 5054254..67acc0a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -30,9 +30,10 @@
<dimen name="widgetItemMinHeight">48dip</dimen>
<dimen name="favicon_size">16dip</dimen>
<dimen name="favicon_padded_size">20dip</dimen>
- <dimen name="qc_radius">130dip</dimen>
- <dimen name="qc_radius_inc">100dip</dimen>
+ <dimen name="qc_radius_start">30dip</dimen>
+ <dimen name="qc_radius_increment">70dip</dimen>
<dimen name="qc_slop">15dip</dimen>
+ <dimen name="qc_tab_title_height">20dip</dimen>
<dimen name="bookmark_widget_thumb_size">32dip</dimen>
<dimen name="bookmark_widget_favicon_size">26dip</dimen>
<!-- For the most visited page -->