diff options
| author | Santos Cordon <santoscordon@google.com> | 2013-10-09 10:38:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 10:38:07 -0700 |
| commit | 3058496c47021350b91b1c5378b87d11f43cb7ce (patch) | |
| tree | b7316f31bb0c5843b21108c1fbd201266f926223 | |
| parent | c25665bebac0f9aa40a33c42a0310884d928817d (diff) | |
| parent | 852fb5d924dceaf9cf142d3e48548e7bbf6c18a6 (diff) | |
am 8f7a4eb3: Merge "update dialpad state more often." into klp-dev
* commit '8f7a4eb36ceaa19e19c4a4d0e71cbad4cc3c934c':
update dialpad state more often.
| -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() { |