diff options
| author | Santos Cordon <santoscordon@google.com> | 2013-10-09 17:35:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 17:35:48 +0000 |
| commit | 852fb5d924dceaf9cf142d3e48548e7bbf6c18a6 (patch) | |
| tree | 0c9c7d673b021a835f95d9ab96c6e19be0c44933 | |
| parent | bbfe72fc455d3365f4a20c19cdb9731ae22754f2 (diff) | |
| parent | d88c3fbaffc0330fd2bb6ce48047680d9540229b (diff) | |
Merge "update dialpad state more often." into klp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 6 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index 36426302f..3b1411be1 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -33,7 +33,6 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto implements InCallStateListener, AudioModeListener, IncomingCallListener { private Call mCall; - private ProximitySensor mProximitySensor; private boolean mAutomaticallyMuted = false; private boolean mPreviousMuteState = false; @@ -49,7 +48,6 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto public void onUiReady(CallButtonUi ui) { super.onUiReady(ui); - mProximitySensor = InCallPresenter.getInstance().getProximitySensor(); AudioModeProvider.getInstance().addListener(this); // register for call state changes last @@ -64,8 +62,6 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto InCallPresenter.getInstance().removeListener(this); AudioModeProvider.getInstance().removeListener(this); InCallPresenter.getInstance().removeIncomingCallListener(this); - - mProximitySensor = null; } @Override @@ -210,8 +206,6 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto public void showDialpadClicked(boolean checked) { Log.v(this, "Show dialpad " + String.valueOf(checked)); getUi().displayDialpad(checked); - mProximitySensor.onDialpadVisible(checked); - updateExtraButtonRow(); } diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index ac21d52a2..58db132a6 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -389,6 +389,8 @@ public class InCallActivity extends Activity { mDialpadFragment.setVisible(false); mCallCardFragment.setVisible(true); } + + InCallPresenter.getInstance().getProximitySensor().onDialpadVisible(showDialpad); } public boolean isDialpadVisible() { |