Merge changes I8e8799fd,I4626262e
* changes:
Add DialpadView's OnPreDrawListener in onFinishInflate() to ensure the layout is inflated before adjustments are made.
Added manifest override for PhoneLookupHistory provider.
diff --git a/java/com/android/dialer/dialpadview/DialpadView.java b/java/com/android/dialer/dialpadview/DialpadView.java
index e7e3c7c..2f494e4 100644
--- a/java/com/android/dialer/dialpadview/DialpadView.java
+++ b/java/com/android/dialer/dialpadview/DialpadView.java
@@ -116,13 +116,6 @@
}
@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 @@
// 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 c5310b9..f8605ae 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -545,6 +545,8 @@
// 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();
}