diff options
| author | Andrew Lee <anwlee@google.com> | 2014-11-08 00:06:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-08 00:06:07 +0000 |
| commit | 5afa4c6b44d4857fc5be60784ffce116e80291b4 (patch) | |
| tree | 3c180691549048fa3527deb46a5d5d460707e249 /InCallUI | |
| parent | 8456537b58acf47ca4d3263ddb5537a5211696f7 (diff) | |
| parent | a13cb5796bd2190161240bbf858563c81f383374 (diff) | |
Merge "Grey out merge button after it is clicked." into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonFragment.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 261378235..cf1c11932 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -167,6 +167,7 @@ public class CallButtonFragment } case R.id.mergeButton: getPresenter().mergeClicked(); + mMergeButton.setEnabled(false); break; case R.id.holdButton: { final ImageButton button = (ImageButton) view; @@ -406,6 +407,11 @@ public class CallButtonFragment @Override public void showMergeButton(boolean show) { mMergeButton.setVisibility(show ? View.VISIBLE : View.GONE); + + // If the merge button was disabled, re-enable it when hiding it. + if (!show) { + mMergeButton.setEnabled(true); + } } @Override |