commit 21a3779bcc30a2c14ee73f0478aa75ec9dd7ba94
author Hall Liu <hallliu@google.com> Wed Jul 26 15:49:27 2017 -0700
committer Hall Liu <hallliu@google.com> Wed Jul 26 23:53:21 2017 +0000
tree 9c8f2da6e9ecdbf4b9134f608ede14a8ee571e10
parent d4345b5459a747ab6652d091a73100841286fb45

Fix "Emergency Information" text overflow

At large font sizes/low DPI values, the "Emergency Information" text at
the top will overflow when tapped. This change uses the new auto-resize
API to prevent the overflow.

Change-Id: Ie6d81869155b8124f8bb6f530efb2af0199351d0
Fixes: 63331318
Test: manual

src/com/android/phone/EmergencyActionGroup.java

diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index 524462e..54842f3 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -240,6 +240,9 @@
     }
 
     private void revealTheButton(View v) {
+        CharSequence buttonText = ((Button) v).getText();
+        mSelectedLabel.setText(buttonText);
+        mSelectedLabel.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
         mSelectedContainer.setVisibility(VISIBLE);
         int centerX = v.getLeft() + v.getWidth() / 2;
         int centerY = v.getTop() + v.getHeight() / 2;
@@ -255,7 +258,6 @@
         animateHintText(mSelectedLabel, v, reveal);
         animateHintText(mLaunchHint, v, reveal);
 
-        mSelectedLabel.setText(((Button) v).getText());
         mSelectedContainer.setTag(R.id.tag_intent, v.getTag(R.id.tag_intent));
         mLastRevealed = v;
         postDelayed(mHideRunnable, HIDE_DELAY);