From eb1d3230b5fc3106d02ccaf1f7a410f3538eb314 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Fri, 27 Nov 2015 19:50:59 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=95=A5=E6=83=85=E5=86=B5=E9=83=BD?=
 =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=EF=BC=8C=E5=9C=A8=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                            | 1 +
 .idea/gradle.xml                                              | 4 ++--
 .idea/misc.xml                                                | 2 +-
 app/app.iml                                                   | 2 +-
 .../main/java/com/bureak/parallaxswipeback/MainActivity.java  | 2 ++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1f2af51..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a8a57c3..66400e1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,8 +5,8 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="E:\Android\android-studio\gradle\gradle-2.4" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleHome" value="D:\ATDT\Android Studio\gradle\gradle-2.4" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6a1e020..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/app.iml b/app/app.iml
index 310b1ea..05f59e9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -90,8 +90,8 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
index c416b8e..3ab4f2e 100644
--- a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
+++ b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -25,6 +26,7 @@ public void onClick(View v) {
                 Intent intent = new Intent(MainActivity.this,NextActivity.class);
                 intent.putExtra("index",0);
                 startParallaxSwipeBackActivty(MainActivity.this, intent);
+                Log.e("TAG","this is test");
             }
         });
 

From e7db96aa7741f2027c1cb7125b7055f5117b5a1d Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 11:19:49 +0800
Subject: [PATCH 02/10] just add test log

---
 .../main/java/com/bureak/parallaxswipeback/MainActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
index 3ab4f2e..7b2a3aa 100644
--- a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
+++ b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
@@ -26,7 +26,7 @@ public void onClick(View v) {
                 Intent intent = new Intent(MainActivity.this,NextActivity.class);
                 intent.putExtra("index",0);
                 startParallaxSwipeBackActivty(MainActivity.this, intent);
-                Log.e("TAG","this is test");
+                Log.e("TAG","just a log");
             }
         });
 

From 5b87874b2b2ac79f95fd4b569dfdfe07285e3ef2 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 11:23:43 +0800
Subject: [PATCH 03/10] just add a log two

---
 app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
index 7b2a3aa..d6d52c0 100644
--- a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
+++ b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
@@ -27,6 +27,7 @@ public void onClick(View v) {
                 intent.putExtra("index",0);
                 startParallaxSwipeBackActivty(MainActivity.this, intent);
                 Log.e("TAG","just a log");
+                Log.e("TAG","why7");
             }
         });
 

From f4b80401bd981e68f4dada52bb52bef5ecfa89e8 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 11:27:26 +0800
Subject: [PATCH 04/10] just add test thress

---
 .../main/java/com/bureak/parallaxswipeback/MainActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
index d6d52c0..0a95cdc 100644
--- a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
+++ b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
@@ -26,8 +26,9 @@ public void onClick(View v) {
                 Intent intent = new Intent(MainActivity.this,NextActivity.class);
                 intent.putExtra("index",0);
                 startParallaxSwipeBackActivty(MainActivity.this, intent);
-                Log.e("TAG","just a log");
-                Log.e("TAG","why7");
+                Log.e("TAG", "just a log");
+                Log.e("TAG", "why7");
+                Log.e("TAG","thress");
             }
         });
 

From 5e05ac12a922f3de8b897ea4e10b3c53da4f0ad8 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 11:46:05 +0800
Subject: [PATCH 05/10] Test Android Studio Pull Code

---
 ReadMe.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt
new file mode 100644
index 0000000..d74cd89
--- /dev/null
+++ b/ReadMe.txt
@@ -0,0 +1 @@
+ReadMe Frist
\ No newline at end of file

From bf28c260862c57b196876b154dabea7656f805cd Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 11:49:41 +0800
Subject: [PATCH 06/10] Delete a Test File

---
 ReadMe.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt
deleted file mode 100644
index d74cd89..0000000
--- a/ReadMe.txt
+++ /dev/null
@@ -1 +0,0 @@
-ReadMe Frist
\ No newline at end of file

From 03c39ffff0d4685398dec4b2ce68dcaec1027591 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 13:45:33 +0800
Subject: [PATCH 07/10] Revert "Delete a Test File"

This reverts commit bf28c260862c57b196876b154dabea7656f805cd.
---
 ReadMe.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt
new file mode 100644
index 0000000..d74cd89
--- /dev/null
+++ b/ReadMe.txt
@@ -0,0 +1 @@
+ReadMe Frist
\ No newline at end of file

From bb268985dd853862f337a2be8b16dc4ae339dd92 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 13:45:51 +0800
Subject: [PATCH 08/10] Revert "Revert "Delete a Test File""

This reverts commit 03c39ffff0d4685398dec4b2ce68dcaec1027591.
---
 ReadMe.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt
deleted file mode 100644
index d74cd89..0000000
--- a/ReadMe.txt
+++ /dev/null
@@ -1 +0,0 @@
-ReadMe Frist
\ No newline at end of file

From b9eeaeb7809861c9f26e4965f090f07fdef34de6 Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 13:46:02 +0800
Subject: [PATCH 09/10] Revert "Revert "Revert "Delete a Test File"""

This reverts commit bb268985dd853862f337a2be8b16dc4ae339dd92.
---
 ReadMe.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt
new file mode 100644
index 0000000..d74cd89
--- /dev/null
+++ b/ReadMe.txt
@@ -0,0 +1 @@
+ReadMe Frist
\ No newline at end of file

From 090a8bbe1d847517c6888f020a1616080b90b50d Mon Sep 17 00:00:00 2001
From: kaiwboy <2596536983@qq.com>
Date: Sat, 28 Nov 2015 13:47:21 +0800
Subject: [PATCH 10/10] Revert "Revert "Revert "Revert "Delete a Test File""""

This reverts commit b9eeaeb7809861c9f26e4965f090f07fdef34de6.
---
 ReadMe.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 ReadMe.txt

diff --git a/ReadMe.txt b/ReadMe.txt
deleted file mode 100644
index d74cd89..0000000
--- a/ReadMe.txt
+++ /dev/null
@@ -1 +0,0 @@
-ReadMe Frist
\ No newline at end of file