From b8b2af8be793c442add61afbe852d55ef978361c Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 20 May 2011 15:58:33 -0700
Subject: Initial implementation of the useragent switcher

Change-Id: Iaa8262a678902645dbfaa8a53fe7212af7d9d53c
---
 res/drawable-mdpi/ic_ua_android.png | Bin 0 -> 1431 bytes
 res/drawable-mdpi/ic_ua_desktop.png | Bin 0 -> 973 bytes
 res/values/strings.xml              |   5 +++++
 res/xml-sw600dp/lab_preferences.xml |  43 ++++++++++++++++++++++++++++++++++++
 res/xml-xlarge/lab_preferences.xml  |  37 -------------------------------
 5 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 res/drawable-mdpi/ic_ua_android.png
 create mode 100644 res/drawable-mdpi/ic_ua_desktop.png
 create mode 100644 res/xml-sw600dp/lab_preferences.xml
 delete mode 100644 res/xml-xlarge/lab_preferences.xml

(limited to 'res')

diff --git a/res/drawable-mdpi/ic_ua_android.png b/res/drawable-mdpi/ic_ua_android.png
new file mode 100644
index 0000000..4f7aa45
Binary files /dev/null and b/res/drawable-mdpi/ic_ua_android.png differ
diff --git a/res/drawable-mdpi/ic_ua_desktop.png b/res/drawable-mdpi/ic_ua_desktop.png
new file mode 100644
index 0000000..4e2f5c2
Binary files /dev/null and b/res/drawable-mdpi/ic_ua_desktop.png differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90c6cc1..ad8f64d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -657,10 +657,15 @@
     <string name="pref_use_instant_search_summary">
       Use Google Instant when you use Google Search, to show results as you
       type (this can increase data use).</string>
+    <!-- Title for the fullscreen lab feature [CHAR LIMIT=40] -->
     <string name="pref_lab_fullscreen">Fullscreen</string>
     <!-- Summary for the fullscreen lab feature [CHAR LIMIT=120] -->
     <string name="pref_lab_fullscreen_summary">
       Use fullscreen mode to hide the status bar.</string>
+    <!-- Title for the useragent switcher lab feature [CHAR LIMIT=40] -->
+    <string name="pref_enable_useragent_switcher">Useragent Switcher</string>
+    <!-- Summary for the useragent switcher lab feature [CHAR LIMIT=120] -->
+    <string name="pref_enable_useragent_switcher_summary">Toggle between tablet and desktop versions of a site (per tab)</string>
 
     <!-- Title for a dialog displayed when the browser has a data connectivity
             problem -->
diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml-sw600dp/lab_preferences.xml
new file mode 100644
index 0000000..c858c38
--- /dev/null
+++ b/res/xml-sw600dp/lab_preferences.xml
@@ -0,0 +1,43 @@
+<?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" />
+
+    <CheckBoxPreference
+        android:key="use_most_visited_homepage"
+        android:defaultValue="false"
+        android:title="@string/pref_lab_most_visited_homepage"
+        android:summary="@string/pref_lab_most_visited_homepage_summary" />
+
+    <CheckBoxPreference
+        android:key="use_instant_search"
+        android:defaultValue="false"
+        android:title="@string/pref_use_instant_search"
+        android:summary="@string/pref_use_instant_search_summary" />
+
+    <CheckBoxPreference
+        android:key="enable_useragent_switcher"
+        android:defaultValue="false"
+        android:title="@string/pref_enable_useragent_switcher"
+        android:summary="@string/pref_enable_useragent_switcher_summary" />
+</PreferenceScreen>
diff --git a/res/xml-xlarge/lab_preferences.xml b/res/xml-xlarge/lab_preferences.xml
deleted file mode 100644
index 87383b0..0000000
--- a/res/xml-xlarge/lab_preferences.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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" />
-
-    <CheckBoxPreference
-        android:key="use_most_visited_homepage"
-        android:defaultValue="false"
-        android:title="@string/pref_lab_most_visited_homepage"
-        android:summary="@string/pref_lab_most_visited_homepage_summary" />
-
-    <CheckBoxPreference
-        android:key="use_instant_search"
-        android:defaultValue="false"
-        android:title="@string/pref_use_instant_search"
-        android:summary="@string/pref_use_instant_search_summary" />
-</PreferenceScreen>
-- 
cgit v1.1