diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-03-22 10:54:04 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-03-22 10:54:04 -0400 |
| commit | bf083d25e023ebebf9593dcb62ac413f28816584 (patch) | |
| tree | 7074d4f124f4c392002077ce4c6b602a6fcdfe21 /src/com/android | |
| parent | 3d8b70cc80a42ce1b7146aade2a4a0fca0b1eba2 (diff) | |
| download | packages_apps_Browser-bf083d25e023ebebf9593dcb62ac413f28816584.tar.gz packages_apps_Browser-bf083d25e023ebebf9593dcb62ac413f28816584.tar.bz2 packages_apps_Browser-bf083d25e023ebebf9593dcb62ac413f28816584.zip | |
Show stop button in a pressed state when pressed.
Fix for http://b/issue?id=2533372
Change-Id: I9a614a95f5537d17c9cb89e96afe6c21fc56d59a
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/TitleBar.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index ee6aa9c09..0f1986474 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -156,13 +156,14 @@ public class TitleBar extends LinearLayout { @Override public boolean onTouchEvent(MotionEvent event) { + ImageView button = mInLoad ? mStopButton : mRtButton; switch (event.getAction()) { case MotionEvent.ACTION_DOWN: // Make all touches hit either the textfield or the button, // depending on which side of the right edge of the textfield // they hit. if ((int) event.getX() > mTitleBg.getRight()) { - mRtButton.setPressed(true); + button.setPressed(true); } else { mTitleBg.setPressed(true); mHandler.sendMessageDelayed(mHandler.obtainMessage( @@ -178,7 +179,7 @@ public class TitleBar extends LinearLayout { // other is pressed. Since the user moved off the title // bar, mark both as not pressed. mTitleBg.setPressed(false); - mRtButton.setPressed(false); + button.setPressed(false); mHandler.removeMessages(LONG_PRESS); break; } @@ -187,17 +188,17 @@ public class TitleBar extends LinearLayout { if (mTitleBg.isPressed() && x > titleRight + slop) { mTitleBg.setPressed(false); mHandler.removeMessages(LONG_PRESS); - } else if (mRtButton.isPressed() && x < titleRight - slop) { - mRtButton.setPressed(false); + } else if (button.isPressed() && x < titleRight - slop) { + button.setPressed(false); } break; case MotionEvent.ACTION_CANCEL: - mRtButton.setPressed(false); + button.setPressed(false); mTitleBg.setPressed(false); mHandler.removeMessages(LONG_PRESS); break; case MotionEvent.ACTION_UP: - if (mRtButton.isPressed()) { + if (button.isPressed()) { if (mInVoiceMode) { if (mBrowserActivity.getTabControl().getCurrentTab() .voiceSearchSourceIsGoogle()) { @@ -213,7 +214,7 @@ public class TitleBar extends LinearLayout { } else { mBrowserActivity.bookmarksOrHistoryPicker(false); } - mRtButton.setPressed(false); + button.setPressed(false); } else if (mTitleBg.isPressed()) { mHandler.removeMessages(LONG_PRESS); if (mInVoiceMode) { |