mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1216257 - Rename "Customize" category to "General" r=sebastian 

--HG--
rename : mobile/android/base/resources/xml-v11/preferences_customize.xml => mobile/android/base/resources/xml-v11/preferences_general.xml
rename : mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml => mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml => mobile/android/base/resources/xml/preferences_general.xml
rename : mobile/android/base/resources/xml/preferences_customize_tablet.xml => mobile/android/base/resources/xml/preferences_general_tablet.xml
extra : commitid : 7p8QMvlBKb6
extra : rebase_source : f59ba82a5ec034c1c4cfe4ea718225bad9ccff80
This commit is contained in:
Margaret Leibovic 2015-10-21 10:57:15 -04:00
Родитель efdebbd94c
Коммит 928ed9eec2
11 изменённых файлов: 29 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
mobile/android/base/locales/en-US/android_strings.dtd
Просмотреть файл

@ -103,9 +103,8 @@
<!ENTITY settings_title "Settings">
<!ENTITY pref_category_input_options "Input options">
<!ENTITY pref_category_advanced "Advanced">
<!ENTITY pref_category_customize "Customize">
<!ENTITY pref_category_customize_summary "Home, search, tabs, import">
<!ENTITY pref_category_customize_alt_summary "Home, search, tabs, open later, import">
<!ENTITY pref_category_general "General">
<!ENTITY pref_category_general_summary "Home, language, zoom, full-screen browsing">
<!-- Localization note (pref_category_language) : This is the preferences
section in which the user picks the locale in which to display Firefox
@ -203,7 +202,7 @@
<!ENTITY home_homepage_use_current_tab "Use current tab">
<!-- Localization note: These are shown in the left sidebar on tablets -->
<!ENTITY pref_header_customize "Customize">
<!ENTITY pref_header_general "General">
<!ENTITY pref_header_display "Display">
<!ENTITY pref_header_privacy_short "Privacy">
<!ENTITY pref_header_help "Help">

2
mobile/android/base/preferences/GeckoPreferenceFragment.java
Просмотреть файл

@ -191,7 +191,7 @@ public class GeckoPreferenceFragment extends PreferenceFragment {
boolean isMultiPane = Versions.feature11Plus &&
((PreferenceActivity) activity).isMultiPane();
resid = isMultiPane ? R.xml.preferences_customize_tablet : R.xml.preferences;
resid = isMultiPane ? R.xml.preferences_general_tablet : R.xml.preferences;
}
return resid;

13
mobile/android/base/preferences/GeckoPreferences.java
Просмотреть файл

@ -78,7 +78,6 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.Toast;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@ -154,7 +153,6 @@ OnSharedPreferenceChangeListener
public static final String PREFS_RESTORE_SESSION = NON_PREF_PREFIX + "restoreSession3";
public static final String PREFS_SUGGESTED_SITES = NON_PREF_PREFIX + "home_suggested_sites";
public static final String PREFS_TAB_QUEUE = NON_PREF_PREFIX + "tab_queue";
public static final String PREFS_CUSTOMIZE_SCREEN = NON_PREF_PREFIX + "customize_screen";
public static final String PREFS_TAB_QUEUE_LAST_SITE = NON_PREF_PREFIX + "last_site";
public static final String PREFS_TAB_QUEUE_LAST_TIME = NON_PREF_PREFIX + "last_time";
@ -247,8 +245,8 @@ OnSharedPreferenceChangeListener
title = R.string.pref_category_language;
} else if (res == R.xml.preferences_vendor) {
title = R.string.pref_category_vendor;
} else if (res == R.xml.preferences_customize) {
title = R.string.pref_category_customize;
} else if (res == R.xml.preferences_general) {
title = R.string.pref_category_general;
} else if (res == R.xml.preferences_search) {
title = R.string.pref_category_search;
}
@ -344,7 +342,7 @@ OnSharedPreferenceChangeListener
// This is the default header, because it's the first one.
// I know, this is an affront to all human decency. And yet.
updateTitle(getString(R.string.pref_header_customize));
updateTitle(getString(R.string.pref_header_general));
}
if (onIsMultiPane()) {
@ -472,7 +470,7 @@ OnSharedPreferenceChangeListener
if (!onIsMultiPane()) {
fragmentArgs.putString(INTENT_EXTRA_RESOURCES, "preferences");
} else {
fragmentArgs.putString(INTENT_EXTRA_RESOURCES, "preferences_customize_tablet");
fragmentArgs.putString(INTENT_EXTRA_RESOURCES, "preferences_general_tablet");
}
}
@ -703,9 +701,6 @@ OnSharedPreferenceChangeListener
} else if (pref instanceof PanelsPreferenceCategory) {
mPanelsPreferenceCategory = (PanelsPreferenceCategory) pref;
}
if(TabQueueHelper.TAB_QUEUE_ENABLED && PREFS_CUSTOMIZE_SCREEN.equals(key)) {
pref.setSummary(getString(R.string.pref_category_customize_alt_summary));
}
if (getResources().getString(R.string.pref_category_input_options).equals(key)) {
if (!InputOptionsUtils.supportsVoiceRecognizer(getApplicationContext(), getResources().getString(R.string.voicesearch_prompt)) &&
!InputOptionsUtils.supportsQrCodeReader(getApplicationContext())) {

6
mobile/android/base/resources/xml-v11/preference_headers.xml
Просмотреть файл

@ -3,16 +3,16 @@
- 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/. -->
<!-- Tablet only: Sync is nested within the "Customize" header on tablets,
<!-- Tablet only: Sync is nested within the "General" header on tablets,
instead of being a top-level menu item.
See xml-v11/preferences.xml for single-pane v11+ phone layout. -->
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
android:title="@string/pref_header_customize">
android:title="@string/pref_header_general">
<extra android:name="resource"
android:value="preferences_customize_tablet"/>
android:value="preferences_general_tablet"/>
</header>
<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"

8
mobile/android/base/resources/xml-v11/preferences.xml
Просмотреть файл

@ -16,12 +16,12 @@
android:summary="@string/pref_sync_summary"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_customize"
android:summary="@string/pref_category_customize_summary"
android:key="android.not_a_preference.customize_screen"
<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_customize"/>
android:value="preferences_general"/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_display"

4
mobile/android/base/resources/xml-v11/preferences_customize.xml → mobile/android/base/resources/xml-v11/preferences_general.xml
Просмотреть файл

@ -3,13 +3,13 @@
- 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/. -->
<!-- Changes should be mirrored to preferences_customize_tablet.xml. -->
<!-- Changes should be mirrored to preferences_general_tablet.xml. -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto"
android:enabled="false">
<PreferenceScreen android:key="android.not_a_preference.customize_home"
<PreferenceScreen android:key="android.not_a_preference.general_home"
android:title="@string/pref_category_home"
android:summary="@string/pref_category_home_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >

8
mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml → mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
Просмотреть файл

@ -3,20 +3,20 @@
- 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/. -->
<!-- Tablet only: The contents under the "Customize" header for tablets,
<!-- Tablet only: The contents under the "General" header for tablets,
See xml-v11/preferences.xml for single-pane v11+ phone layout.
Changes to preferences should be mirrored to preferences_customize.xml. -->
Changes to preferences should be mirrored to preferences_general.xml. -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto"
android:title="@string/pref_category_customize"
android:title="@string/pref_category_general"
android:enabled="false">
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:persistent="false" />
<PreferenceScreen android:key="android.not_a_preference.customize_home"
<PreferenceScreen android:key="android.not_a_preference.general_home"
android:title="@string/pref_category_home"
android:summary="@string/pref_category_home_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >

8
mobile/android/base/resources/xml/preferences.xml
Просмотреть файл

@ -16,15 +16,15 @@
android:summary="@string/pref_sync_summary"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_customize"
android:summary="@string/pref_category_customize_summary"
android:key="android.not_a_preference.customize_screen">
<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_customize" />
android:value="preferences_general" />
</intent>
</PreferenceScreen>

2
mobile/android/base/resources/xml/preferences_customize.xml → mobile/android/base/resources/xml/preferences_general.xml
Просмотреть файл

@ -8,7 +8,7 @@
android:enabled="false">
<PreferenceScreen
android:key="android.not_a_preference.customize_home"
android:key="android.not_a_preference.general_home"
android:title="@string/pref_category_home"
android:summary="@string/pref_category_home_summary" >
<intent android:action="android.intent.action.VIEW"

0
mobile/android/base/resources/xml/preferences_customize_tablet.xml → mobile/android/base/resources/xml/preferences_general_tablet.xml
Просмотреть файл

7
mobile/android/base/strings.xml.in
Просмотреть файл

@ -142,9 +142,8 @@
<string name="settings_title">&settings_title;</string>
<string name="pref_category_input_options">&pref_category_input_options;</string>
<string name="pref_category_advanced">&pref_category_advanced;</string>
<string name="pref_category_customize">&pref_category_customize;</string>
<string name="pref_category_customize_summary">&pref_category_customize_summary;</string>
<string name="pref_category_customize_alt_summary">&pref_category_customize_alt_summary;</string>
<string name="pref_category_general">&pref_category_general;</string>
<string name="pref_category_general_summary">&pref_category_general_summary;</string>
<string name="pref_category_search">&pref_category_search3;</string>
<string name="pref_category_search_summary">&pref_category_search_summary;</string>
@ -189,7 +188,7 @@
<string name="home_homepage_title">&home_homepage_title;</string>
<string name="home_homepage_use_current_tab">&home_homepage_use_current_tab;</string>
<string name="pref_header_customize">&pref_header_customize;</string>
<string name="pref_header_general">&pref_header_general;</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_language">&pref_header_language;</string>