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 1246707 - Set all Snackbar durations to LONG. r=ahunt

Browse Source 
MozReview-Commit-ID: EuSc6movOlX
This commit is contained in:
Sebastian Kaspari 2016-02-17 14:14:20 +00:00
parent 95b0026673
commit bfcaedd135
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
View File

@ -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

2
mobile/android/base/java/org/mozilla/gecko/EditBookmarkDialog.java
View File

@ -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();
}

8
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
View File

@ -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);

2
mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java
View File

@ -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
);
}

2
mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java
View File

@ -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);
}
}
}

2
mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
View File

@ -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);

2
mobile/android/base/java/org/mozilla/gecko/preferences/SearchEnginePreference.java
View File

@ -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;
}

4
mobile/android/chrome/content/ActionBarHandler.js
View File

@ -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");

2
mobile/android/chrome/content/MasterPassword.js
View File

@ -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;
}
};

2
mobile/android/chrome/content/Reader.js
View File

@ -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;
}

2
mobile/android/chrome/content/SelectionHandler.js
View File

@ -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();
},

10
mobile/android/chrome/content/aboutLogins.js
View File

@ -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();
},

16
mobile/android/chrome/content/browser.js
View File

@ -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) {