diff options
| author | John Reck <jreck@google.com> | 2011-05-24 15:53:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-24 15:53:07 -0700 |
| commit | 45377778b556064718b61c9495ae5bdc900fd996 (patch) | |
| tree | 4743c5e054de7c2a1a3d0e60cfbe876fa8ad0865 /res | |
| parent | b0a86db3bfa39863977efd3bac5c9bf527d224aa (diff) | |
| parent | 92935a725584211fcd14a99ee4b64b1da25ea61b (diff) | |
| download | packages_apps_browser-45377778b556064718b61c9495ae5bdc900fd996.zip packages_apps_browser-45377778b556064718b61c9495ae5bdc900fd996.tar.gz packages_apps_browser-45377778b556064718b61c9495ae5bdc900fd996.tar.bz2 | |
Merge "Help dialog for useragent switcher lab"
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-mdpi/help_useragent_laptop.png | bin | 0 -> 3964 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/help_useragent_tablet.png | bin | 0 -> 4171 bytes | |||
| -rw-r--r-- | res/layout/help_dialog_useragent_switcher.xml | 37 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
4 files changed, 40 insertions, 1 deletions
diff --git a/res/drawable-mdpi/help_useragent_laptop.png b/res/drawable-mdpi/help_useragent_laptop.png Binary files differnew file mode 100644 index 0000000..59aa721 --- /dev/null +++ b/res/drawable-mdpi/help_useragent_laptop.png diff --git a/res/drawable-mdpi/help_useragent_tablet.png b/res/drawable-mdpi/help_useragent_tablet.png Binary files differnew file mode 100644 index 0000000..7b579cd --- /dev/null +++ b/res/drawable-mdpi/help_useragent_tablet.png diff --git a/res/layout/help_dialog_useragent_switcher.xml b/res/layout/help_dialog_useragent_switcher.xml new file mode 100644 index 0000000..cc29a2d --- /dev/null +++ b/res/layout/help_dialog_useragent_switcher.xml @@ -0,0 +1,37 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/help_useragent_switcher" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/help_useragent_tablet" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/help_useragent_laptop" /> + +</LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index ad8f64d..ae28023 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -665,7 +665,9 @@ <!-- 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> + <string name="pref_enable_useragent_switcher_summary">Toggle between the tablet and desktop versions of a site</string> + <!-- Text explaining how to use the useragent switcher lab feature [CHAR LIMIT=none] --> + <string name="help_useragent_switcher">Tap on the Android or laptop icon to toggle between the tablet and desktop versions of a site.</string> <!-- Title for a dialog displayed when the browser has a data connectivity problem --> |
