author | Lucas Rocha <lucasr@lucasr.org> |
Fri, 19 Sep 2014 15:18:17 +0100 | |
changeset 206253 | 6c2940e4d2834ef25572649998c0232b204761b7 |
parent 206252 | 913568167ec54fb13c34285495275de26638cf2d |
child 206254 | 014f231ac17308d76631dbc5d59882070549e60e |
push id | 49381 |
push user | ryanvm@gmail.com |
push date | Fri, 19 Sep 2014 18:14:36 +0000 |
treeherder | mozilla-inbound@206e963fb3dd [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mcomella |
bugs | 1066634 |
milestone | 35.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -493,16 +493,22 @@ just addresses the organization to follo <!ENTITY updater_downloading_title2 "Downloading &brandShortName;"> <!ENTITY updater_downloading_title_failed2 "Download failed"> <!ENTITY updater_downloading_select2 "Touch to apply update once downloaded"> <!ENTITY updater_downloading_retry2 "Touch to retry"> <!ENTITY updater_apply_title2 "Update available for &brandShortName;"> <!ENTITY updater_apply_select2 "Touch to update"> +<!-- New tablet UI --> + +<!-- LOCALIZATION NOTE (new_tablet_restart): Notification displayed after the user toggles the new tablet UI in the settings screen.--> +<!ENTITY new_tablet_restart "Restart the browser for the changes to take effect"> +<!ENTITY new_tablet_pref "Enable new tablet UI"> + <!-- Guest mode --> <!ENTITY new_guest_session "New Guest Session"> <!ENTITY exit_guest_session "Exit Guest Session"> <!ENTITY guest_session_dialog_continue "Continue"> <!ENTITY guest_session_dialog_cancel "Cancel"> <!ENTITY new_guest_session_title "&brandShortName; will now restart"> <!ENTITY new_guest_session_text "The person using it will not be able to see any of your personal browsing data (like saved passwords, history or bookmarks).\n\nWhen your guest is done, their browsing data will be deleted and your session will be restored."> <!ENTITY guest_browsing_notification_title "Guest browsing is enabled">
--- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/mobile/android/base/preferences/GeckoPreferences.java @@ -1006,17 +1006,17 @@ OnSharedPreferenceChangeListener @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (PREFS_BROWSER_LOCALE.equals(key)) { onLocaleSelected(BrowserLocaleManager.getLanguageTag(lastLocale), sharedPreferences.getString(key, null)); } else if (PREFS_SUGGESTED_SITES.equals(key)) { refreshSuggestedSites(); } else if (PREFS_NEW_TABLET_UI.equals(key)) { - Toast.makeText(this, "Restart the browser for the changes to take effect", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.new_tablet_restart, Toast.LENGTH_SHORT).show(); } } public interface PrefHandler { public void setupPref(Context context, Preference pref); public void onChange(Context context, Preference pref, Object newValue); }
--- a/mobile/android/base/resources/xml/preferences_display.xml +++ b/mobile/android/base/resources/xml/preferences_display.xml @@ -20,20 +20,18 @@ android:entries="@array/pref_titlebar_mode_entries" android:entryValues="@array/pref_titlebar_mode_values" android:persistent="false" /> <CheckBoxPreference android:key="browser.chrome.dynamictoolbar" android:title="@string/pref_scroll_title_bar2" android:summary="@string/pref_scroll_title_bar_summary" /> - <!-- Title string is hardcoded here because it's not meant to be translated - because this is just a temporary development toggle. --> <CheckBoxPreference android:key="android.not_a_preference.new_tablet_ui" - android:title="Enable new tablet UI" + android:title="@string/new_tablet_pref" android:defaultValue="false" /> <PreferenceCategory android:title="@string/pref_category_advanced"> <CheckBoxPreference android:key="browser.zoom.reflowOnZoom" android:title="@string/pref_reflow_on_zoom" android:defaultValue="false"
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -428,16 +428,20 @@ <string name="updater_downloading_title">&updater_downloading_title2;</string> <string name="updater_downloading_title_failed">&updater_downloading_title_failed2;</string> <string name="updater_downloading_select">&updater_downloading_select2;</string> <string name="updater_downloading_retry">&updater_downloading_retry2;</string> <string name="updater_apply_title">&updater_apply_title2;</string> <string name="updater_apply_select">&updater_apply_select2;</string> + <!-- New tablet UI --> + <string name="new_tablet_restart">&new_tablet_restart;</string> + <string name="new_tablet_pref">&new_tablet_pref;</string> + <!-- Search suggestions opt-in --> <string name="suggestions_prompt">&suggestions_prompt3;</string> <string name="suggestion_for_engine">&suggestion_for_engine;</string> <!-- Set Image Notifications --> <string name="set_image_fail">&set_image_fail;</string> <string name="set_image_path_fail">&set_image_path_fail;</string>