From bfcaedd13525d5e2bf4f51504c6ea7af57592120 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Wed, 17 Feb 2016 14:14:20 +0000 Subject: [PATCH] Bug 1246707 - Set all Snackbar durations to LONG. r=ahunt MozReview-Commit-ID: EuSc6movOlX --- .../base/java/org/mozilla/gecko/BrowserApp.java | 4 ++-- .../org/mozilla/gecko/EditBookmarkDialog.java | 2 +- .../base/java/org/mozilla/gecko/GeckoApp.java | 8 ++++---- .../java/org/mozilla/gecko/GeckoAppShell.java | 2 +- .../org/mozilla/gecko/home/HomeFragment.java | 2 +- .../gecko/preferences/GeckoPreferences.java | 2 +- .../preferences/SearchEnginePreference.java | 2 +- .../android/chrome/content/ActionBarHandler.js | 4 ++-- mobile/android/chrome/content/MasterPassword.js | 2 +- mobile/android/chrome/content/Reader.js | 2 +- .../android/chrome/content/SelectionHandler.js | 2 +- mobile/android/chrome/content/aboutLogins.js | 10 +++++----- mobile/android/chrome/content/browser.js | 16 ++++++++-------- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 7e8cc28ca2c..43cce499c54 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -424,7 +424,7 @@ public class BrowserApp extends GeckoApp } private void showBookmarkRemovedSnackbar() { - SnackbarHelper.showSnackbar(this, getResources().getString(R.string.bookmark_removed), Snackbar.LENGTH_SHORT); + SnackbarHelper.showSnackbar(this, getResources().getString(R.string.bookmark_removed), Snackbar.LENGTH_LONG); } private void showSwitchToReadingListSnackbar(String message) { @@ -456,7 +456,7 @@ public class BrowserApp extends GeckoApp public void onRemovedFromReadingList(String url) { SnackbarHelper.showSnackbar(this, getResources().getString(R.string.reading_list_removed), - Snackbar.LENGTH_SHORT); + Snackbar.LENGTH_LONG); } @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/EditBookmarkDialog.java b/mobile/android/base/java/org/mozilla/gecko/EditBookmarkDialog.java index ddd7482b489..ada7c5c0c9f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/EditBookmarkDialog.java +++ b/mobile/android/base/java/org/mozilla/gecko/EditBookmarkDialog.java @@ -219,7 +219,7 @@ public class EditBookmarkDialog { public void onPostExecute(Void result) { SnackbarHelper.showSnackbar((Activity) context, context.getString(R.string.bookmark_updated), - Snackbar.LENGTH_SHORT); + Snackbar.LENGTH_LONG); } }).execute(); } diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 48f940a815f..b1e58467cd6 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -576,7 +576,7 @@ public abstract class GeckoApp ThreadUtils.postToUiThread(new Runnable() { @Override public void run() { - SnackbarHelper.showSnackbar(GeckoApp.this, getString(resId), Snackbar.LENGTH_SHORT); + SnackbarHelper.showSnackbar(GeckoApp.this, getString(resId), Snackbar.LENGTH_LONG); } }); } @@ -1014,12 +1014,12 @@ public abstract class GeckoApp File dcimDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES); if (!dcimDir.mkdirs() && !dcimDir.isDirectory()) { - SnackbarHelper.showSnackbar(this, getString(R.string.set_image_path_fail), Snackbar.LENGTH_SHORT); + SnackbarHelper.showSnackbar(this, getString(R.string.set_image_path_fail), Snackbar.LENGTH_LONG); return; } String path = Media.insertImage(getContentResolver(),image, null, null); if (path == null) { - SnackbarHelper.showSnackbar(this, getString(R.string.set_image_path_fail), Snackbar.LENGTH_SHORT); + SnackbarHelper.showSnackbar(this, getString(R.string.set_image_path_fail), Snackbar.LENGTH_LONG); return; } final Intent intent = new Intent(Intent.ACTION_ATTACH_DATA); @@ -1036,7 +1036,7 @@ public abstract class GeckoApp }; ActivityHandlerHelper.startIntentForActivity(this, chooser, handler); } else { - SnackbarHelper.showSnackbar(this, getString(R.string.set_image_fail), Snackbar.LENGTH_SHORT); + SnackbarHelper.showSnackbar(this, getString(R.string.set_image_fail), Snackbar.LENGTH_LONG); } } catch(OutOfMemoryError ome) { Log.e(LOGTAG, "Out of Memory when converting to byte array", ome); diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java index 2775c8b44e7..af74f76cfe9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java @@ -2670,7 +2670,7 @@ public class GeckoAppShell private static final void showImageShareFailureSnackbar() { SnackbarHelper.showSnackbar((Activity) getContext(), getApplicationContext().getString(R.string.share_image_failed), - Snackbar.LENGTH_SHORT + Snackbar.LENGTH_LONG ); } diff --git a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java index cf31ef58e86..3f40908dd4e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java @@ -419,7 +419,7 @@ public abstract class HomeFragment extends Fragment { public void onPostExecute(Void result) { SnackbarHelper.showSnackbar((Activity) mContext, mContext.getString(R.string.page_removed), - Snackbar.LENGTH_SHORT); + Snackbar.LENGTH_LONG); } } } diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java index 86b413eabed..014f1b23c9b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java @@ -655,7 +655,7 @@ OnSharedPreferenceChangeListener SnackbarHelper.showSnackbar(GeckoPreferences.this, getString(stringRes), - Snackbar.LENGTH_SHORT); + Snackbar.LENGTH_LONG); } } catch (Exception e) { Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e); diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/SearchEnginePreference.java b/mobile/android/base/java/org/mozilla/gecko/preferences/SearchEnginePreference.java index ff641895745..9118a22d6ef 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/SearchEnginePreference.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/SearchEnginePreference.java @@ -94,7 +94,7 @@ public class SearchEnginePreference extends CustomListPreference { SnackbarHelper.showSnackbar(activity, activity.getString(R.string.pref_search_last_toast), - Snackbar.LENGTH_SHORT); + Snackbar.LENGTH_LONG); return; } diff --git a/mobile/android/chrome/content/ActionBarHandler.js b/mobile/android/chrome/content/ActionBarHandler.js index f60fa9718dd..2081071c3a2 100644 --- a/mobile/android/chrome/content/ActionBarHandler.js +++ b/mobile/android/chrome/content/ActionBarHandler.js @@ -348,7 +348,7 @@ var ActionBarHandler = { clipboard.copyString(selectedText); let msg = Strings.browser.GetStringFromName("selectionHelper.textCopied"); - Snackbars.show(msg, Snackbars.LENGTH_SHORT); + Snackbars.show(msg, Snackbars.LENGTH_LONG); // Then cut the selection text. ActionBarHandler._getSelection(element, win).deleteFromDocument(); @@ -383,7 +383,7 @@ var ActionBarHandler = { clipboard.copyString(selectedText); let msg = Strings.browser.GetStringFromName("selectionHelper.textCopied"); - Snackbars.show(msg, Snackbars.LENGTH_SHORT); + Snackbars.show(msg, Snackbars.LENGTH_LONG); ActionBarHandler._uninit(); UITelemetry.addEvent("action.1", "actionbar", null, "copy"); diff --git a/mobile/android/chrome/content/MasterPassword.js b/mobile/android/chrome/content/MasterPassword.js index a88db84d19f..5c77f625d17 100644 --- a/mobile/android/chrome/content/MasterPassword.js +++ b/mobile/android/chrome/content/MasterPassword.js @@ -63,7 +63,7 @@ var MasterPassword = { } catch(e) { dump("MasterPassword.removePassword: " + e + "\n"); } - Snackbars.show(Strings.browser.GetStringFromName("masterPassword.incorrect"), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.GetStringFromName("masterPassword.incorrect"), Snackbars.LENGTH_LONG); return false; } }; diff --git a/mobile/android/chrome/content/Reader.js b/mobile/android/chrome/content/Reader.js index a2325690399..7695e161a30 100644 --- a/mobile/android/chrome/content/Reader.js +++ b/mobile/android/chrome/content/Reader.js @@ -180,7 +180,7 @@ var Reader = { case "Reader:ToolbarHidden": if (!this._hasUsedToolbar) { - Snackbars.show(Strings.browser.GetStringFromName("readerMode.toolbarTip"), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.GetStringFromName("readerMode.toolbarTip"), Snackbars.LENGTH_LONG); Services.prefs.setBoolPref("reader.has_used_toolbar", true); this._hasUsedToolbar = true; } diff --git a/mobile/android/chrome/content/SelectionHandler.js b/mobile/android/chrome/content/SelectionHandler.js index 7f59916dd33..2f8a237195f 100644 --- a/mobile/android/chrome/content/SelectionHandler.js +++ b/mobile/android/chrome/content/SelectionHandler.js @@ -1090,7 +1090,7 @@ var SelectionHandler = { if (selectedText.length) { let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); clipboard.copyString(selectedText); - Snackbars.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), Snackbars.LENGTH_LONG); } this._closeSelection(); }, diff --git a/mobile/android/chrome/content/aboutLogins.js b/mobile/android/chrome/content/aboutLogins.js index b116f4e18e8..99e2af841ad 100644 --- a/mobile/android/chrome/content/aboutLogins.js +++ b/mobile/android/chrome/content/aboutLogins.js @@ -31,10 +31,10 @@ function copyStringShowSnackbar(string, notifyString) { try { let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); clipboard.copyString(string); - Snackbars.show(notifyString, Snackbars.LENGTH_SHORT); + Snackbars.show(notifyString, Snackbars.LENGTH_LONG); } catch (e) { debug("Error copying from about:logins"); - Snackbars.show(gStringBundle.GetStringFromName("loginsDetails.copyFailed"), Snackbars.LENGTH_SHORT); + Snackbars.show(gStringBundle.GetStringFromName("loginsDetails.copyFailed"), Snackbars.LENGTH_LONG); } } @@ -291,7 +291,7 @@ var Logins = { if ((newUsername === origUsername) && (newPassword === origPassword) && (newDomain === origDomain) ) { - Snackbars.show(gStringBundle.GetStringFromName("editLogin.saved1"), Snackbars.LENGTH_SHORT); + Snackbars.show(gStringBundle.GetStringFromName("editLogin.saved1"), Snackbars.LENGTH_LONG); this._showList(); return; } @@ -310,10 +310,10 @@ var Logins = { } } } catch (e) { - Snackbars.show(gStringBundle.GetStringFromName("editLogin.couldNotSave"), Snackbars.LENGTH_SHORT); + Snackbars.show(gStringBundle.GetStringFromName("editLogin.couldNotSave"), Snackbars.LENGTH_LONG); return; } - Snackbars.show(gStringBundle.GetStringFromName("editLogin.saved1"), Snackbars.LENGTH_SHORT); + Snackbars.show(gStringBundle.GetStringFromName("editLogin.saved1"), Snackbars.LENGTH_LONG); this._showList(); }, diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 3446fdf8dfe..6652b64a2fc 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -462,7 +462,7 @@ var BrowserApp = { Messaging.addListener(this.getHistory.bind(this), "Session:GetHistory"); function showFullScreenWarning() { - Snackbars.show(Strings.browser.GetStringFromName("alertFullScreenToast"), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.GetStringFromName("alertFullScreenToast"), Snackbars.LENGTH_LONG); } window.addEventListener("fullscreen", function() { @@ -1018,7 +1018,7 @@ var BrowserApp = { return; } let message = Strings.browser.GetStringFromName("imageblocking.downloadedImage"); - Snackbars.show(message, Snackbars.LENGTH_SHORT, { + Snackbars.show(message, Snackbars.LENGTH_LONG, { action: { label: Strings.browser.GetStringFromName("imageblocking.showAllImages"), callback: () => { @@ -1326,7 +1326,7 @@ var BrowserApp = { message = Strings.browser.GetStringFromName("undoCloseToast.messageDefault"); } - Snackbars.show(message, Snackbars.LENGTH_SHORT, { + Snackbars.show(message, Snackbars.LENGTH_LONG, { action: { label: Strings.browser.GetStringFromName("undoCloseToast.action2"), callback: function() { @@ -3002,7 +3002,7 @@ var NativeWindow = { _copyStringToDefaultClipboard: function(aString) { let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); clipboard.copyString(aString); - Snackbars.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), Snackbars.LENGTH_LONG); }, _stripScheme: function(aString) { @@ -5618,7 +5618,7 @@ var XPInstallObserver = { switch (aTopic) { case "addon-install-started": - Snackbars.show(strings.GetStringFromName("alertAddonsDownloading"), Snackbars.LENGTH_SHORT); + Snackbars.show(strings.GetStringFromName("alertAddonsDownloading"), Snackbars.LENGTH_LONG); break; case "addon-install-disabled": { if (!tab) @@ -6682,7 +6682,7 @@ var SearchEngines = { Services.search.addEngine(engine.url, Ci.nsISearchEngine.DATA_XML, engine.iconURL, false, { onSuccess: function() { // Display a toast confirming addition of new search engine. - Snackbars.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [engine.title], 1), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [engine.title], 1), Snackbars.LENGTH_LONG); }, onError: function(aCode) { @@ -6696,7 +6696,7 @@ var SearchEngines = { errorMessage = "alertSearchEngineErrorToast"; } - Snackbars.show(Strings.browser.formatStringFromName(errorMessage, [engine.title], 1), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.formatStringFromName(errorMessage, [engine.title], 1), Snackbars.LENGTH_LONG); } }); }, @@ -6777,7 +6777,7 @@ var SearchEngines = { name = title.value + " " + i; Services.search.addEngineWithDetails(name, favicon, null, null, method, formURL); - Snackbars.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [name], 1), Snackbars.LENGTH_SHORT); + Snackbars.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [name], 1), Snackbars.LENGTH_LONG); let engine = Services.search.getEngineByName(name); engine.wrappedJSObject._queryCharset = charset; for (let i = 0; i < formData.length; ++i) {