Remove "Dial to add call" text in Dialpad
Also remove some unnecessary strings
Bug: 17647791
Change-Id: I0e5797b3aad35dd37607fde944c1329fbeffbe88
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7a88b98..b98aad3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -500,17 +500,6 @@
<!-- String used to display calls from pay phone in the call log -->
<string name="payphone">Pay phone</string>
- <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
- to dial using the physical keyboard -->
- <string name="dialerKeyboardHintText">Use keyboard to dial</string>
-
- <!-- Hint text displayed in the "digits" field above the dialer's
- dialpad, if there's already a call in progress. (This hint
- reminds the user that the dialer will add a new call, as opposed
- to sending DTMF tones over the current call.)
- [CHAR LIMIT=40] -->
- <string name="dialerDialpadHintText">Dial to add a call</string>
-
<!-- A nicely formatted call duration displayed when viewing call details. For example "42 mins 28 secs" -->
<string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%s</xliff:g> mins <xliff:g id="seconds" example="28">%s</xliff:g> secs</string>
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index c9ea25a..b5b3121 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -611,26 +611,8 @@
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 @@
}
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 @@
}
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 {