Bug 898151 - Add informational graphic to search engine customisation menu. r=liuche
authorChris Kitching <ckitching@mozilla.com>
Mon, 05 Aug 2013 08:40:09 -0700
changeset 149384 c057ecd8f9b4e82b7ab7ca6d54d8b752d9c5064d
parent 149383 b92db71dc525ce3db360b2727818ca7b8a1e1aab
child 149385 74d364de5fbb84d65f95416e31d113ea3adedb0b
push idunknown
push userunknown
push dateunknown
reviewersliuche
bugs898151
milestone25.0a1
Bug 898151 - Add informational graphic to search engine customisation menu. r=liuche
mobile/android/base/Makefile.in
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/drawable-hdpi/tip_addsearch.png
mobile/android/base/resources/drawable-mdpi/tip_addsearch.png
mobile/android/base/resources/drawable-xhdpi/tip_addsearch.png
mobile/android/base/resources/layout/preference_search_tip.xml
mobile/android/base/resources/xml/preferences_search.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -469,16 +469,17 @@ RES_LAYOUT = \
   res/layout/launch_app_listitem.xml \
   res/layout/menu_action_bar.xml \
   res/layout/menu_item_action_view.xml \
   res/layout/menu_popup.xml \
   res/layout/notification_icon_text.xml \
   res/layout/notification_progress.xml \
   res/layout/notification_progress_text.xml \
   res/layout/preference_rightalign_icon.xml \
+  res/layout/preference_search_tip.xml \
   res/layout/search_engine_row.xml \
   res/layout/site_setting_item.xml \
   res/layout/site_setting_title.xml \
   res/layout/shared_ui_components.xml \
   res/layout/site_identity.xml \
   res/layout/suggestion_item.xml \
   res/layout/remote_tabs_child.xml \
   res/layout/remote_tabs_group.xml \
@@ -667,16 +668,17 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/spinner_pressed.9.png \
   res/drawable-mdpi/tab_new.png \
   res/drawable-mdpi/tab_new_pb.png \
   res/drawable-mdpi/tab_close.png \
   res/drawable-mdpi/tab_thumbnail_default.png \
   res/drawable-mdpi/tab_thumbnail_shadow.png \
   res/drawable-mdpi/tabs_count.png \
   res/drawable-mdpi/tabs_count_foreground.png \
+  res/drawable-mdpi/tip_addsearch.png \
   res/drawable-mdpi/toast.9.png \
   res/drawable-mdpi/toast_button_focused.9.png \
   res/drawable-mdpi/toast_button_pressed.9.png \
   res/drawable-mdpi/toast_divider.9.png \
   res/drawable-mdpi/address_bar_url_default.9.png \
   res/drawable-mdpi/address_bar_url_default_pb.9.png \
   res/drawable-mdpi/address_bar_url_pressed.9.png \
   res/drawable-mdpi/address_bar_url_pressed_pb.9.png \
@@ -779,16 +781,17 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/spinner_pressed.9.png \
   res/drawable-hdpi/tab_new.png \
   res/drawable-hdpi/tab_new_pb.png \
   res/drawable-hdpi/tab_close.png \
   res/drawable-hdpi/tab_thumbnail_default.png \
   res/drawable-hdpi/tab_thumbnail_shadow.png \
   res/drawable-hdpi/tabs_count.png \
   res/drawable-hdpi/tabs_count_foreground.png \
+  res/drawable-hdpi/tip_addsearch.png \
   res/drawable-hdpi/address_bar_url_default.9.png \
   res/drawable-hdpi/address_bar_url_default_pb.9.png \
   res/drawable-hdpi/address_bar_url_pressed.9.png \
   res/drawable-hdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-hdpi/find_close.png \
   res/drawable-hdpi/find_next.png \
   res/drawable-hdpi/find_prev.png \
   res/drawable-hdpi/larry.png \
@@ -875,16 +878,17 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/spinner_pressed.9.png \
   res/drawable-xhdpi/tab_new.png \
   res/drawable-xhdpi/tab_new_pb.png \
   res/drawable-xhdpi/tab_close.png \
   res/drawable-xhdpi/tab_thumbnail_default.png \
   res/drawable-xhdpi/tab_thumbnail_shadow.png \
   res/drawable-xhdpi/tabs_count.png \
   res/drawable-xhdpi/tabs_count_foreground.png \
+  res/drawable-xhdpi/tip_addsearch.png \
   res/drawable-xhdpi/find_close.png \
   res/drawable-xhdpi/find_next.png \
   res/drawable-xhdpi/find_prev.png \
   res/drawable-xhdpi/urlbar_stop.png \
   res/drawable-xhdpi/reader.png \
   res/drawable-xhdpi/reader_active.png \
   res/drawable-xhdpi/reading_list.png \
   res/drawable-xhdpi/larry.png \
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -67,16 +67,21 @@
 <!ENTITY pref_category_advanced "Advanced">
 <!ENTITY pref_category_customize "Customize">
 <!ENTITY pref_category_search2 "Search settings">
 <!ENTITY pref_category_display "Display">
 <!ENTITY pref_category_privacy_short "Privacy">
 <!ENTITY pref_category_vendor "&vendorShortName;">
 <!ENTITY pref_category_datareporting "Data choices">
 <!ENTITY pref_category_installed_search_engines "Installed search engines">
+<!ENTITY pref_category_add_search_providers "Add more search providers">
+<!-- Localization note (pref_search_tip) : "TIP" as in "hint", "clue" etc. Displayed as an
+     advisory message on the customise search providers settings page explaining how to add new
+     search providers.-->
+<!ENTITY pref_search_tip "TIP: Add any website to your list of search providers by long-pressing on its search field.">
 <!ENTITY pref_category_devtools "Developer tools">
 <!ENTITY pref_developer_remotedebugging "Remote debugging">
 <!ENTITY pref_developer_remotedebugging_docs "Learn more">
 <!ENTITY pref_remember_signons "Remember passwords">
 
 <!-- Localization note: These are shown in the left sidebar on tablets -->
 <!ENTITY pref_header_customize "Customize">
 <!ENTITY pref_header_display "Display">
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..823dc8baa885e1e7175b5320d7847641bd0de2c3
GIT binary patch
literal 3446
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
Y3Z=V_<)YVpTL1t607*qoM6N<$g3m<7@&Et;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6ad0bbac025013e4b74f8fd6965365a5dc8dd9c6
GIT binary patch
literal 2323
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8bb3d10e880ca22df6fce564c98600b35ffc88e5
GIT binary patch
literal 4541
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
LZRJX+RoH(3<I0y<
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_search_tip.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="6dip"
+        android:paddingRight="6dip"
+        android:layout_weight="1">
+
+        <TextView android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:paddingTop="8dp"
+                  android:paddingBottom="8dp"
+                  android:text="@string/pref_search_tip"/>
+
+    </RelativeLayout>
+
+    <ImageView android:layout_height="wrap_content"
+               android:layout_width="wrap_content"
+               android:paddingRight="8dp"
+               android:paddingTop="12dip"
+               android:src="@drawable/tip_addsearch"/>
+
+</LinearLayout>
--- a/mobile/android/base/resources/xml/preferences_search.xml
+++ b/mobile/android/base/resources/xml/preferences_search.xml
@@ -10,9 +10,18 @@
 
     <CheckBoxPreference android:key="browser.search.suggest.enabled"
                         android:title="@string/pref_search_suggestions"
                         android:defaultValue="false"
                         android:persistent="false" />
 
     <org.mozilla.gecko.preferences.SearchPreferenceCategory
                         android:title="@string/pref_category_installed_search_engines"/>
+
+    <PreferenceCategory android:title="@string/pref_category_add_search_providers">
+
+        <Preference android:layout="@layout/preference_search_tip"
+                    android:enabled="false"
+                    android:selectable="false"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -80,16 +80,18 @@
   <string name="pref_category_advanced">&pref_category_advanced;</string>
   <string name="pref_category_customize">&pref_category_customize;</string>
   <string name="pref_category_search">&pref_category_search2;</string>
   <string name="pref_category_display">&pref_category_display;</string>
   <string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
   <string name="pref_category_vendor">&pref_category_vendor;</string>
   <string name="pref_category_datareporting">&pref_category_datareporting;</string>
   <string name="pref_category_installed_search_engines">&pref_category_installed_search_engines;</string>
+  <string name="pref_category_add_search_providers">&pref_category_add_search_providers;</string>
+  <string name="pref_search_tip">&pref_search_tip;</string>
   <string name="pref_category_devtools">&pref_category_devtools;</string>
   <string name="pref_developer_remotedebugging">&pref_developer_remotedebugging;</string>
   <string name="pref_developer_remotedebugging_docs">&pref_developer_remotedebugging_docs;</string>
 
   <string name="pref_header_customize">&pref_header_customize;</string>
   <string name="pref_header_display">&pref_header_display;</string>
   <string name="pref_header_privacy_short">&pref_header_privacy_short;</string>
   <string name="pref_header_vendor">&pref_header_vendor;</string>