From d45a1f0a112758b5f204467b43819201c5c984e3 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 28 Oct 2014 14:32:48 -0700 Subject: Remove "Dial to add call" text in Dialpad Also remove some unnecessary strings Bug: 17647791 Change-Id: I0e5797b3aad35dd37607fde944c1329fbeffbe88 --- .../android/dialer/dialpad/DialpadFragment.java | 26 ++++------------------ 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'src/com/android/dialer/dialpad') diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index c9ea25a68..b5b31211e 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -611,26 +611,8 @@ public class DialpadFragment extends AnalyticsFragment stopWatch.lap("tm"); - // Potentially show hint text in the mDigits field when the user - // hasn't typed any digits yet. (If there's already an active call, - // this hint text will remind the user that he's about to add a new - // call.) - // - // TODO: consider adding better UI for the case where *both* lines - // are currently in use. (Right now we let the user try to add - // another call, but that call is guaranteed to fail. Perhaps the - // entire dialer UI should be disabled instead.) - if (isPhoneInUse()) { - final SpannableString hint = new SpannableString( - getActivity().getString(R.string.dialerDialpadHintText)); - hint.setSpan(new RelativeSizeSpan(0.8f), 0, hint.length(), 0); - mDigits.setHint(hint); - } else { - // Common case; no hint necessary. - mDigits.setHint(null); - - // Also, a sanity-check: the "dialpad chooser" UI should NEVER - // be visible if the phone is idle! + if (!isPhoneInUse()) { + // A sanity-check: the "dialpad chooser" UI should not be visible if the phone is idle. showDialpadChooser(false); } @@ -1203,7 +1185,7 @@ public class DialpadFragment extends AnalyticsFragment } if (enabled) { - Log.i(TAG, "Showing dialpad chooser!"); + Log.d(TAG, "Showing dialpad chooser!"); if (mDialpadView != null) { mDialpadView.setVisibility(View.GONE); } @@ -1218,7 +1200,7 @@ public class DialpadFragment extends AnalyticsFragment } mDialpadChooser.setAdapter(mDialpadChooserAdapter); } else { - Log.i(TAG, "Displaying normal Dialer UI."); + Log.d(TAG, "Displaying normal Dialer UI."); if (mDialpadView != null) { mDialpadView.setVisibility(View.VISIBLE); } else { -- cgit v1.2.3