Switched to AppCompatEditText stuff that come from the support librar…

…y v22.1. This introduces the latest optimization in support lib v22.1.
hixin · Apr 27, 2015 · 00e1a4c · 00e1a4c
1 parent eeec1ef
commit 00e1a4c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -19,7 +19,7 @@ android {
 dependencies {
   compile 'com.android.support:support-annotations:22.0.0'
   compile 'com.nineoldandroids:library:2.4.0'
-  compile 'com.android.support:appcompat-v7:22.0.0'
+  compile 'com.android.support:appcompat-v7:22.1.0'
 }
 
 // Used to push in maven

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialAutoCompleteTextView.java
@@ -16,6 +16,7 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.text.Editable;
 import android.text.Layout;
 import android.text.StaticLayout;
@@ -28,7 +29,6 @@
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.AutoCompleteTextView;
 import android.content.res.ColorStateList;
 
 import com.nineoldandroids.animation.ArgbEvaluator;
@@ -46,7 +46,7 @@
  * author:rengwuxian
  * <p/>
  */
-public class MaterialAutoCompleteTextView extends AutoCompleteTextView {
+public class MaterialAutoCompleteTextView extends AppCompatAutoCompleteTextView {
 
   @IntDef({FLOATING_LABEL_NONE, FLOATING_LABEL_NORMAL, FLOATING_LABEL_HIGHLIGHT})
   public @interface FloatingLabelType {

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -17,6 +17,7 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.Layout;
 import android.text.StaticLayout;
@@ -46,7 +47,7 @@
  * author:rengwuxian
  * <p/>
  */
-public class MaterialEditText extends EditText {
+public class MaterialEditText extends AppCompatEditText {
 
   @IntDef({FLOATING_LABEL_NONE, FLOATING_LABEL_NORMAL, FLOATING_LABEL_HIGHLIGHT})
   public @interface FloatingLabelType {

diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialMultiAutoCompleteTextView.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialMultiAutoCompleteTextView.java
@@ -17,6 +17,7 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.AppCompatMultiAutoCompleteTextView;
 import android.text.Editable;
 import android.text.Layout;
 import android.text.StaticLayout;
@@ -29,7 +30,6 @@
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.MultiAutoCompleteTextView;
 
 import com.nineoldandroids.animation.ArgbEvaluator;
 import com.nineoldandroids.animation.ObjectAnimator;
@@ -43,7 +43,7 @@
 /**
  * Created by rengwuxian on 2015/1/8.
  */
-public class MaterialMultiAutoCompleteTextView extends MultiAutoCompleteTextView {
+public class MaterialMultiAutoCompleteTextView extends AppCompatMultiAutoCompleteTextView {
 
   @IntDef({FLOATING_LABEL_NONE, FLOATING_LABEL_NORMAL, FLOATING_LABEL_HIGHLIGHT})
   public @interface FloatingLabelType {