Hide the menu icon when dialpad chooser is shown
Now that we may have the menu icon on the right side of digits
EditText, we should hide the whole container instead of the
EditText itself.
TESTED (with phone devices with/without a hard menu key):
- show dialpad chooser and see the screen is not corrupted
Bug: 5183700
Change-Id: Ib598d799799a2e65b3b61524adfa2a64e47eb456
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index 9c5099f..75d5938 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -25,6 +25,7 @@
<!-- Text field and possibly soft menu button above the keypad where
the digits are displayed. -->
<RelativeLayout
+ android:id="@+id/digits_container"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="0.200"
diff --git a/src/com/android/contacts/dialpad/DialpadFragment.java b/src/com/android/contacts/dialpad/DialpadFragment.java
index 188c546..c70be1e 100644
--- a/src/com/android/contacts/dialpad/DialpadFragment.java
+++ b/src/com/android/contacts/dialpad/DialpadFragment.java
@@ -96,7 +96,9 @@
public void onSearchButtonPressed();
}
+ private View mDigitsContainer;
private EditText mDigits;
+
private View mDelete;
private ToneGenerator mToneGenerator;
private Object mToneGeneratorLock = new Object();
@@ -240,6 +242,7 @@
// Load up the resources for the text field.
Resources r = getResources();
+ mDigitsContainer = fragmentView.findViewById(R.id.digits_container);
mDigits = (EditText) fragmentView.findViewById(R.id.digits);
mDigits.setKeyListener(DialerKeyListener.getInstance());
mDigits.setOnClickListener(this);
@@ -920,7 +923,7 @@
if (enabled) {
// Log.i(TAG, "Showing dialpad chooser!");
- mDigits.setVisibility(View.GONE);
+ mDigitsContainer.setVisibility(View.GONE);
if (mDialpad != null) mDialpad.setVisibility(View.GONE);
mAdditionalButtonsRow.setVisibility(View.GONE);
mDialpadChooser.setVisibility(View.VISIBLE);
@@ -933,7 +936,7 @@
mDialpadChooser.setAdapter(mDialpadChooserAdapter);
} else {
// Log.i(TAG, "Displaying normal Dialer UI.");
- mDigits.setVisibility(View.VISIBLE);
+ mDigitsContainer.setVisibility(View.VISIBLE);
if (mDialpad != null) mDialpad.setVisibility(View.VISIBLE);
mAdditionalButtonsRow.setVisibility(View.VISIBLE);
mDialpadChooser.setVisibility(View.GONE);