summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2010-12-15 11:52:57 -0800
committerMichael Kolb <kolby@google.com>2010-12-15 11:53:02 -0800
commit376b54116e38b3b94c4d64663d1bff38352b0e59 (patch)
tree97d9f406203b494b7dc529d17d8728858942d3ad /res
parent439c9a58765aa6aab95d55422ee61ea8360e912d (diff)
downloadpackages_apps_browser-376b54116e38b3b94c4d64663d1bff38352b0e59.zip
packages_apps_browser-376b54116e38b3b94c4d64663d1bff38352b0e59.tar.gz
packages_apps_browser-376b54116e38b3b94c4d64663d1bff38352b0e59.tar.bz2
Add quick controls
Bug: http://b/issue?id=3277888 Added Quick Controls Lab setting Implemented Quick Controls UI Change-Id: I72011daf9140aa5d15c8b785126867c10bbc5501
Diffstat (limited to 'res')
-rw-r--r--res/drawable-mdpi/ic_pie_back.pngbin0 -> 574 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_bookmarks.pngbin0 -> 748 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_close_tab.pngbin0 -> 506 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_forward.pngbin0 -> 544 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_more.pngbin0 -> 517 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_new_tab.pngbin0 -> 377 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_refresh.pngbin0 -> 1310 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_search.pngbin0 -> 1080 bytes
-rw-r--r--res/drawable-mdpi/ic_pie_tabs.pngbin0 -> 465 bytes
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimensions.xml3
-rw-r--r--res/values/strings.xml7
-rw-r--r--res/xml/lab_preferences.xml26
-rw-r--r--res/xml/preference_headers.xml5
14 files changed, 43 insertions, 0 deletions
diff --git a/res/drawable-mdpi/ic_pie_back.png b/res/drawable-mdpi/ic_pie_back.png
new file mode 100644
index 0000000..daddaea
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_back.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_bookmarks.png b/res/drawable-mdpi/ic_pie_bookmarks.png
new file mode 100644
index 0000000..ffa430d
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_bookmarks.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_close_tab.png b/res/drawable-mdpi/ic_pie_close_tab.png
new file mode 100644
index 0000000..62396f4
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_close_tab.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_forward.png b/res/drawable-mdpi/ic_pie_forward.png
new file mode 100644
index 0000000..bd8dcac
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_forward.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_more.png b/res/drawable-mdpi/ic_pie_more.png
new file mode 100644
index 0000000..c96c6a4
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_more.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_new_tab.png b/res/drawable-mdpi/ic_pie_new_tab.png
new file mode 100644
index 0000000..206675a
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_new_tab.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_refresh.png b/res/drawable-mdpi/ic_pie_refresh.png
new file mode 100644
index 0000000..5980f8b
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_refresh.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_search.png b/res/drawable-mdpi/ic_pie_search.png
new file mode 100644
index 0000000..6981697
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pie_tabs.png b/res/drawable-mdpi/ic_pie_tabs.png
new file mode 100644
index 0000000..fda262a
--- /dev/null
+++ b/res/drawable-mdpi/ic_pie_tabs.png
Binary files differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5a5d255..31a8458 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,4 +29,6 @@
<color name="bookmarkWidgetDivider">#383847</color>
<color name="bookmarkWidgetItemBackground">#2b2b3c</color>
<color name="bookmarkWidgetFolderBackground">#A0383847</color>
+ <color name="qc_slice_normal">#C0A0A0A0</color>
+ <color name="qc_slice_active">#C02090FF</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 7cfa3f6..a4ab90a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -28,4 +28,7 @@
<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_slop">15dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1c8b71c..383ac9c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -590,6 +590,13 @@
<item>EUC-KR</item>
</string-array>
<string name="pref_default_text_encoding_default" translatable="false">Latin-1</string>
+ <!-- Title for lab settings [CHAR LIMIT=25] -->
+ <string name="pref_lab_title">Lab</string>
+ <!-- Title for lab quick controls feature [CHAR LIMIT=40] -->
+ <string name="pref_lab_quick_controls">Quick Controls</string>
+ <!-- Summary for lab quick controls feature [CHAR LIMIT=80] -->
+ <string name="pref_lab_quick_controls_summary">
+ Swipe thumb from left or right edge to access quick controls</string>
<!-- Title for a dialog displayed when the browser has a data connectivity
problem -->
<string name="browserFrameNetworkErrorLabel">Data connectivity problem</string>
diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml
new file mode 100644
index 0000000..2168471
--- /dev/null
+++ b/res/xml/lab_preferences.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <CheckBoxPreference
+ android:key="enable_quick_controls"
+ android:defaultValue="false"
+ android:title="@string/pref_lab_quick_controls"
+ android:summary="@string/pref_lab_quick_controls_summary" />
+
+</PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
index 1a54990..8533a3a 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -35,4 +35,9 @@
<header android:fragment="com.android.browser.preferences.AdvancedPreferencesFragment"
android:title="@string/pref_extras_title"
/>
+
+ <header android:fragment="com.android.browser.preferences.LabPreferencesFragment"
+ android:title="@string/pref_lab_title"
+ />
+
</preference-headers>