diff options
| -rw-r--r-- | java/com/android/dialer/dialpadview/DialpadView.java | 12 | ||||
| -rw-r--r-- | java/com/android/incallui/InCallPresenter.java | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/java/com/android/dialer/dialpadview/DialpadView.java b/java/com/android/dialer/dialpadview/DialpadView.java index e7e3c7cc2..2f494e49d 100644 --- a/java/com/android/dialer/dialpadview/DialpadView.java +++ b/java/com/android/dialer/dialpadview/DialpadView.java @@ -116,13 +116,6 @@ public class DialpadView extends LinearLayout { } @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - getViewTreeObserver().removeOnPreDrawListener(mOnPreDrawListenerForKeyLayoutAdjust); - getViewTreeObserver().addOnPreDrawListener(mOnPreDrawListenerForKeyLayoutAdjust); - } - - @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); getViewTreeObserver().removeOnPreDrawListener(mOnPreDrawListenerForKeyLayoutAdjust); @@ -146,6 +139,11 @@ public class DialpadView extends LinearLayout { // The text view must be selected to send accessibility events. mDigits.setSelected(true); } + + // As OnPreDrawListenerForKeyLayoutAdjust makes changes to LayoutParams, it is added here to + // ensure it can only be triggered after the layout is inflated. + getViewTreeObserver().removeOnPreDrawListener(mOnPreDrawListenerForKeyLayoutAdjust); + getViewTreeObserver().addOnPreDrawListener(mOnPreDrawListenerForKeyLayoutAdjust); } private void setupKeypad() { diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index c5310b969..f8605ae7c 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -545,6 +545,8 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud // Since a call has been added we are no longer waiting for Telecom to send us a call. setBoundAndWaitingForOutgoingCall(false, null); call.registerCallback(mCallCallback); + // TODO(maxwelb): Return the future in recordPhoneLookupInfo and propagate. + PhoneLookupHistoryRecorder.recordPhoneLookupInfo(mContext.getApplicationContext(), call); Trace.endSection(); } |