Chromium Code Reviews| 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 8fdd591efb68055c466561ae84d839479b2bdecb..56fe7bd829b40a6d5062df04b56cd75c3a98fd63 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); |
|
David Trainor- moved to gerrit
2014/10/27 23:58:59
Eventually we should just name these btn_toolbar_s
aurimas (slooooooooow)
2014/10/28 18:11:16
Yeah, I agree, but I want to do it in a separate C
|
| } 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; |
| } |