Snap for 4693621 from 438515f24828cc070e11839638e6266e1df32f20 to pi-release

Change-Id: I7ffa42b6e93159bb901a1c9ed7c9e6cadf04b583

1 files changed, 11 insertions, 2 deletions

diff --git a/src/com/android/phone/common/widget/ResizingTextEditText.java b/src/com/android/phone/common/widget/ResizingTextEditText.java
index 56a30e7..aa9fa68 100644
--- a/src/com/android/phone/common/widget/ResizingTextEditText.java
+++ b/src/com/android/phone/common/widget/ResizingTextEditText.java
@@ -30,6 +30,7 @@ import com.android.phone.common.util.ViewUtil;
 public class ResizingTextEditText extends EditText {
     private final int mOriginalTextSize;
     private final int mMinTextSize;
+    private boolean mIsResizeEnabled = true;
 
     public ResizingTextEditText(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -43,12 +44,20 @@ public class ResizingTextEditText extends EditText {
     @Override
     protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
         super.onTextChanged(text, start, lengthBefore, lengthAfter);
-        ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize);
+        if (mIsResizeEnabled) {
+            ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize);
+        }
     }
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize);
+        if (mIsResizeEnabled) {
+            ViewUtil.resizeText(this, mOriginalTextSize, mMinTextSize);
+        }
+    }
+
+    public void setResizeEnabled(boolean isEnabled) {
+        mIsResizeEnabled = isEnabled;
     }
 }