Merge upstream

XhinLiang · Mar 21, 2016 · 9ef57fc · 9ef57fc
2 parents ba685e6 + e6608cc
commit 9ef57fc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -30,9 +30,9 @@ allprojects {
 
 ``` groovy
 dependencies {
-	compile 'com.github.XhinLiang.MDPreference:mdpreference:0.2.3@aar'
+	compile 'com.github.XhinLiang.MDPreference:mdpreference:0.3.0@aar'
 	// You should add this because the 'mdpreference' depend on this
-    compile 'com.github.XhinLiang.MDPreference:material:0.2.3@aar'
+    compile 'com.github.XhinLiang.MDPreference:material:0.3.0@aar'
     // You should add these because the 'material' depend on them
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:cardview-v7:23.1.1'
@@ -59,6 +59,9 @@ dependencies {
         <io.github.xhinliang.mdpreference.EditTextPreference
             android:key="preference_key_remind_the_same_daywwwd2"
             android:summary="Alert in a week before the birthday"
+            android:positiveButtonText="OK"
+            android:negativeButtonText="Cancel
+            android:dialogTitle="Dialog" 
             android:title="Alert third" />
         <io.github.xhinliang.mdpreference.SwitchPreference
             android:key="preference_key_remind_the_same_day34"
@@ -147,6 +150,7 @@ Set<Integer> set = MultiSelectListPreference.getSetByBit(bit);
 - [Blog](http://xhinliang.github.io)
 
 ## Thanks
+- [ppoffice](https://github.com/ppoffice)
 - [Android-MaterialPreference](https://github.com/jenzz/Android-MaterialPreference)
 - [material-ripple](https://github.com/balysv/material-ripple)
 - [material](https://github.com/rey5137/material)

diff --git a/app/build.gradle b/app/build.gradle
@@ -25,6 +25,6 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:cardview-v7:23.1.1'
     compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'com.github.XhinLiang.MDPreference:mdpreference:0.2.3@aar'
-    compile 'com.github.XhinLiang.MDPreference:material:0.2.3@aar'
+    compile 'com.github.XhinLiang.MDPreference:mdpreference:0.3.0@aar'
+    compile 'com.github.XhinLiang.MDPreference:material:0.3.0@aar'
 }
diff --git a/mdpreference/src/main/java/io/github/xhinliang/mdpreference/Preference.java b/mdpreference/src/main/java/io/github/xhinliang/mdpreference/Preference.java
@@ -1,5 +1,6 @@
 package io.github.xhinliang.mdpreference;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -56,6 +57,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
         typedArray.recycle();
     }
 
+    @SuppressLint("MissingSuperCall")
     @Override
     protected View onCreateView(ViewGroup parent) {
         LayoutInflater layoutInflater =
@@ -72,6 +74,8 @@ protected View onCreateView(ViewGroup parent) {
         return layout;
     }
 
+
+    @SuppressLint("MissingSuperCall")
     @Override
     protected void onBindView(View view) {
         CharSequence title = getTitle();