summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2013-10-08 12:10:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-08 12:10:37 -0700
commit910d5b1404fa7168891010cf32d3a7c06c092863 (patch)
treedbf177830fbfcbf56fec36cf101e8906b67902d2 /InCallUI
parent39daad3648bc8a6f623d03ffaab005867495e1f0 (diff)
parent12fad9b3a124fd02cbb3e0c2d49e2015803aaebc (diff)
am 6c93e39b: Merge "Add logging to dialer." into klp-dev
* commit '6c93e39bd826800eff811a632902eb119e25a291': Add logging to dialer.
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/InCallApp.java2
-rw-r--r--InCallUI/src/com/android/incallui/ProximitySensor.java5
2 files changed, 4 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallApp.java b/InCallUI/src/com/android/incallui/InCallApp.java
index 6708bb49d..dcc78481b 100644
--- a/InCallUI/src/com/android/incallui/InCallApp.java
+++ b/InCallUI/src/com/android/incallui/InCallApp.java
@@ -57,7 +57,7 @@ public class InCallApp extends Application {
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
- Log.v(this, "Broadcast from Notification: ", action);
+ Log.i(this, "Broadcast from Notification: " + action);
if (action.equals(ACTION_HANG_UP_ONGOING_CALL)) {
// TODO: Commands of this nature should exist in the CallList or a
diff --git a/InCallUI/src/com/android/incallui/ProximitySensor.java b/InCallUI/src/com/android/incallui/ProximitySensor.java
index 2210a38a8..0da68efb2 100644
--- a/InCallUI/src/com/android/incallui/ProximitySensor.java
+++ b/InCallUI/src/com/android/incallui/ProximitySensor.java
@@ -216,8 +216,9 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
.add("keybrd", mIsHardKeyboardOpen ? 1 : 0)
.add("dpad", mDialpadVisible ? 1 : 0)
.add("offhook", mIsPhoneOffhook ? 1 : 0)
- .add("aud", audioMode)
- .add("hor", horizontal ? 1 : 0).toString());
+ .add("hor", horizontal ? 1 : 0)
+ .add("ui", mUiShowing ? 1 : 0)
+ .add("aud", AudioMode.toString(audioMode)).toString());
if (mIsPhoneOffhook && !screenOnImmediately) {
final String logStr = "turning on proximity sensor: ";