Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java

Issue 682883002: Introduce TintedImageButton class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
index 0c03d306f5021d4c15f66165d3b92d9252a5425c..3341991646752f023c18c72d74343cc3da814e1b 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
@@ -48,9 +48,10 @@ public class ChromeShellToolbar extends LinearLayout {
public void run() {
mProgressDrawable.setLevel(100 * mProgress);
if (mLoading) {
- mStopReloadButton.setImageResource(R.drawable.btn_stop_normal);
+ mStopReloadButton.setImageResource(
+ R.drawable.btn_toolbar_stop_loading_white_normal);
} else {
- mStopReloadButton.setImageResource(R.drawable.btn_reload_normal);
+ mStopReloadButton.setImageResource(R.drawable.btn_toolbar_reload_white_normal);
ApiCompatibilityUtils.postOnAnimationDelayed(ChromeShellToolbar.this,
mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
}
@@ -155,9 +156,9 @@ public class ChromeShellToolbar extends LinearLayout {
mUrlTextView.setOnEditorActionListener(new OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- if ((actionId != EditorInfo.IME_ACTION_GO) && (event == null ||
- event.getKeyCode() != KeyEvent.KEYCODE_ENTER ||
- event.getAction() != KeyEvent.ACTION_DOWN)) {
+ if ((actionId != EditorInfo.IME_ACTION_GO) && (event == null
+ || event.getKeyCode() != KeyEvent.KEYCODE_ENTER
+ || event.getAction() != KeyEvent.ACTION_DOWN)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698