mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 01:35:35 +00:00
Bug 1261819 - (Pre) Move and replace: xml-v11/preferences.xml -> preferences.xml. r=grisha
MozReview-Commit-ID: LiFy3HcxYMw --HG-- extra : rebase_source : 2e172635a57be42e2f69776c82cc227b7e879153
This commit is contained in:
Sebastian Kaspari
parent
1a78cc422f
commit
35237156a4
@ -1,81 +0,0 @@
|
||||
<?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/. -->
|
||||
|
||||
<!-- Phone v11+ only: Sync is a top-level menu item.
|
||||
See xml-v11/preference_headers.xml for tablet layout.
|
||||
Preference changes here should be mirrored to xml/preferences.xml.in. -->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res-auto"
|
||||
android:enabled="false">
|
||||
|
||||
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
|
||||
android:title="@string/pref_sync"
|
||||
android:icon="@drawable/sync_avatar_default"
|
||||
android:summary="@string/pref_sync_summary"
|
||||
android:persistent="false" />
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_general"
|
||||
android:summary="@string/pref_category_general_summary"
|
||||
android:key="android.not_a_preference.general_screen"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_general"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_search"
|
||||
android:summary="@string/pref_category_search_summary"
|
||||
android:key="android.not_a_preference.search_screen"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_search"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_privacy_short"
|
||||
android:summary="@string/pref_category_privacy_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_privacy" />
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_accessibility"
|
||||
android:summary="@string/pref_category_accessibility_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_accessibility" />
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_notifications"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment">
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_notifications"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_advanced"
|
||||
android:summary="@string/pref_category_advanced_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
|
||||
android:key="android.not_a_preference.advanced_screen" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_advanced"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<org.mozilla.gecko.preferences.PrivateDataPreference
|
||||
android:key="android.not_a_preference.privacy.clear"
|
||||
android:title="@string/pref_clear_private_data_now"
|
||||
android:persistent="true"
|
||||
android:positiveButtonText="@string/button_clear_data"
|
||||
gecko:entries="@array/pref_private_data_entries"
|
||||
gecko:entryValues="@array/pref_private_data_values"
|
||||
gecko:entryKeys="@array/pref_private_data_keys"
|
||||
gecko:initialValues="@array/pref_private_data_defaults" />
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_vendor"
|
||||
android:summary="@string/pref_category_vendor_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_vendor"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
</PreferenceScreen>
|
||||
@ -3,9 +3,9 @@
|
||||
- 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/. -->
|
||||
|
||||
<!-- Preferences screen for pre-v11 Android devices that do not support
|
||||
PreferenceFragment or ActionBar. Preference changes here should be mirrored
|
||||
to xml-v11/preferences.xml. -->
|
||||
<!-- Phone v11+ only: Sync is a top-level menu item.
|
||||
See xml-v11/preference_headers.xml for tablet layout.
|
||||
Preference changes here should be mirrored to xml/preferences.xml.in. -->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res-auto"
|
||||
@ -13,76 +13,52 @@
|
||||
|
||||
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
|
||||
android:title="@string/pref_sync"
|
||||
android:summary="@string/pref_sync_summary"
|
||||
android:icon="@drawable/sync_avatar_default"
|
||||
android:summary="@string/pref_sync_summary"
|
||||
android:persistent="false" />
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_general"
|
||||
android:summary="@string/pref_category_general_summary"
|
||||
android:key="android.not_a_preference.general_screen">
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_general" />
|
||||
</intent>
|
||||
android:key="android.not_a_preference.general_screen"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_general"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_search"
|
||||
android:summary="@string/pref_category_search_summary"
|
||||
android:key="android.not_a_preference.search_screen">
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_search" />
|
||||
</intent>
|
||||
android:key="android.not_a_preference.search_screen"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_search"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_privacy_short"
|
||||
android:summary="@string/pref_category_privacy_summary" >
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_privacy" />
|
||||
</intent>
|
||||
android:summary="@string/pref_category_privacy_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_privacy" />
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_accessibility"
|
||||
android:summary="@string/pref_category_accessibility_summary" >
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_accessibility" />
|
||||
</intent>
|
||||
android:summary="@string/pref_category_accessibility_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_accessibility" />
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_notifications">
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_notifications" />
|
||||
</intent>
|
||||
<PreferenceScreen android:title="@string/pref_category_notifications"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment">
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_notifications"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_advanced"
|
||||
android:summary="@string/pref_category_advanced_summary"
|
||||
android:key="android.not_a_preference.advanced.enabled" >
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_advanced" />
|
||||
</intent>
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
|
||||
android:key="android.not_a_preference.advanced_screen" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_advanced"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
<org.mozilla.gecko.preferences.PrivateDataPreference
|
||||
@ -96,14 +72,10 @@
|
||||
gecko:initialValues="@array/pref_private_data_defaults" />
|
||||
|
||||
<PreferenceScreen android:title="@string/pref_category_vendor"
|
||||
android:summary="@string/pref_category_vendor_summary" >
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="@string/android_package_name"
|
||||
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
|
||||
<extra
|
||||
android:name="resource"
|
||||
android:value="preferences_vendor" />
|
||||
</intent>
|
||||
android:summary="@string/pref_category_vendor_summary"
|
||||
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
|
||||
<extra android:name="resource"
|
||||
android:value="preferences_vendor"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user