wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1216257 - Rearrange search settings to match spec. r=sebastian

Browse Source
This commit is contained in:
Margaret Leibovic 2015-10-23 13:35:09 -04:00
parent 06dadbc8e6
commit e97515f38b
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mobile/android/base/resources/xml-v11/preferences_search.xml
View File

@ -8,6 +8,18 @@
android:title="@string/pref_category_search"
android:enabled="false">
<PreferenceCategory android:title="@string/pref_category_add_search_providers">
<org.mozilla.gecko.preferences.ModifiableHintPreference
android:layout="@layout/preference_search_tip"
android:enabled="false"
android:selectable="false"/>
</PreferenceCategory>
<org.mozilla.gecko.preferences.SearchPreferenceCategory
android:title="@string/pref_category_installed_search_engines"/>
<CheckBoxPreference android:key="browser.search.suggest.enabled"
android:title="@string/pref_search_suggestions"
android:defaultValue="false"
@ -18,16 +30,4 @@
android:defaultValue="true"
android:persistent="true" />
<org.mozilla.gecko.preferences.SearchPreferenceCategory
android:title="@string/pref_category_installed_search_engines"/>
<PreferenceCategory android:title="@string/pref_category_add_search_providers">
<org.mozilla.gecko.preferences.ModifiableHintPreference
android:layout="@layout/preference_search_tip"
android:enabled="false"
android:selectable="false"/>
</PreferenceCategory>
</PreferenceScreen>

30
mobile/android/base/resources/xml/preferences_search.xml
View File

@ -8,15 +8,14 @@
android:title="@string/pref_category_search"
android:enabled="false">
<CheckBoxPreference android:key="browser.search.suggest.enabled"
android:title="@string/pref_search_suggestions"
android:defaultValue="false"
android:persistent="false" />
<PreferenceCategory android:title="@string/pref_category_add_search_providers">
<CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
android:title="@string/pref_history_search_suggestions"
android:defaultValue="true"
android:persistent="true" />
<org.mozilla.gecko.preferences.ModifiableHintPreference
android:layout="@layout/preference_search_tip"
android:enabled="false"
android:selectable="false"/>
</PreferenceCategory>
<org.mozilla.gecko.preferences.SearchPreferenceCategory
android:title="@string/pref_category_installed_search_engines"/>
@ -28,13 +27,14 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_category_add_search_providers">
<CheckBoxPreference android:key="browser.search.suggest.enabled"
android:title="@string/pref_search_suggestions"
android:defaultValue="false"
android:persistent="false" />
<org.mozilla.gecko.preferences.ModifiableHintPreference
android:layout="@layout/preference_search_tip"
android:enabled="false"
android:selectable="false"/>
</PreferenceCategory>
<CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
android:title="@string/pref_history_search_suggestions"
android:defaultValue="true"
android:persistent="true" />
</PreferenceScreen>