Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/app.iml
#	stateLayout/stateLayout.iml

StateLayout.iml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="StateLayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

local.properties

@@ -7,7 +7,7 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Aug 25 19:13:35 CST 2016
+#Fri Oct 28 18:56:40 CST 2016
 bintray.apikey=5384eaa3c8048eebfa44448fb2ec389209780556
-sdk.dir=E\:\\Android\\sdk
+sdk.dir=D\:\\Android\\sdk
 bintray.user=lcc-luffy

stateLayout/src/main/java/com/lufficc/stateLayout/StateLayout.java

@@ -109,7 +109,7 @@ private void parseAttrs(Context context, AttributeSet attrs) {
         if (errorDrawable != null) {
             errorImageView.setImageDrawable(errorDrawable);
         } else {
-            errorImageView.setImageResource(R.mipmap.ic_error);
+            errorImageView.setImageResource(R.mipmap.ic_state_layout_error);
         }
         addView(errorView);
         /******************************************************************************************/
@@ -123,7 +123,7 @@ private void parseAttrs(Context context, AttributeSet attrs) {
         if (emptyDrawable != null) {
             emptyImageView.setImageDrawable(emptyDrawable);
         } else {
-            emptyImageView.setImageResource(R.mipmap.ic_empty);
+            emptyImageView.setImageResource(R.mipmap.ic_state_layout_empty);
         }
         addView(emptyView);
         /******************************************************************************************/