From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 31 Aug 2017 06:57:16 -0700 Subject: Update Dialer source to latest internal Google revision. Previously, Android's Dialer app was developed in an internal Google source control system and only exported to public during AOSP drops. The Dialer team is now switching to a public development model similar to the telephony team. This CL represents all internal Google changes that were committed to Dialer between the public O release and today's tip of tree on internal master. This CL squashes those changes into a single commit. In subsequent changes, changes will be exported on a per-commit basis. Test: make, flash install, run Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160 Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8 PiperOrigin-RevId: 167068436 --- java/com/android/incallui/DialpadFragment.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'java/com/android/incallui/DialpadFragment.java') diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java index 7f494aa61..fbcd4078e 100644 --- a/java/com/android/incallui/DialpadFragment.java +++ b/java/com/android/incallui/DialpadFragment.java @@ -35,6 +35,8 @@ import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.dialpadview.DialpadKeyButton; import com.android.dialer.dialpadview.DialpadKeyButton.OnPressedListener; import com.android.dialer.dialpadview.DialpadView; +import com.android.dialer.logging.DialerImpression; +import com.android.dialer.logging.Logger; import com.android.incallui.DialpadPresenter.DialpadUi; import com.android.incallui.baseui.BaseFragment; import java.util.Map; @@ -87,6 +89,8 @@ public class DialpadFragment extends BaseFragment @Override public void onClick(View v) { if (v.getId() == R.id.dialpad_back) { + Logger.get(getContext()) + .logImpression(DialerImpression.Type.IN_CALL_DIALPAD_CLOSE_BUTTON_PRESSED); getActivity().onBackPressed(); } } @@ -107,6 +111,7 @@ public class DialpadFragment extends BaseFragment case KeyEvent.ACTION_UP: getPresenter().stopDtmf(); break; + default: // fall out } // do not return true [handled] here, since we want the // press / click animation to be handled by the framework. @@ -125,7 +130,7 @@ public class DialpadFragment extends BaseFragment return this; } - // TODO Adds hardware keyboard listener + // TODO(klp) Adds hardware keyboard listener @Override public View onCreateView( @@ -261,6 +266,8 @@ public class DialpadFragment extends BaseFragment @Override public void onPressed(View view, boolean pressed) { if (pressed && mDisplayMap.containsKey(view.getId())) { + Logger.get(getContext()) + .logImpression(DialerImpression.Type.IN_CALL_DIALPAD_NUMBER_BUTTON_PRESSED); Log.d(this, "onPressed: " + pressed + " " + mDisplayMap.get(view.getId())); getPresenter().processDtmf(mDisplayMap.get(view.getId())); } @@ -315,7 +322,7 @@ public class DialpadFragment extends BaseFragment * Overrides the characters used in {@link DialerKeyListener#CHARACTERS} These are the valid * dtmf characters. */ - public final char[] DTMF_CHARACTERS = + public final char[] dtmfCharacters = new char[] {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '#', '*'}; private DTMFKeyListener() { @@ -325,7 +332,7 @@ public class DialpadFragment extends BaseFragment /** Overriden to return correct DTMF-dialable characters. */ @Override protected char[] getAcceptedChars() { - return DTMF_CHARACTERS; + return dtmfCharacters; } /** special key listener ignores backspace. */ -- cgit v1.2.3