Skip to content

Master #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Master #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb1d323
啥情况都不知道，在测试
Lw-KaiwB Nov 27, 2015
e7db96a
just add test log
Lw-KaiwB Nov 28, 2015
5b87874
just add a log two
Lw-KaiwB Nov 28, 2015
f4b8040
just add test thress
Lw-KaiwB Nov 28, 2015
5e05ac1
Test Android Studio Pull Code
Lw-KaiwB Nov 28, 2015
bf28c26
Delete a Test File
Lw-KaiwB Nov 28, 2015
03c39ff
Revert "Delete a Test File"
Lw-KaiwB Nov 28, 2015
bb26898
Revert "Revert "Delete a Test File""
Lw-KaiwB Nov 28, 2015
b9eeaeb
Revert "Revert "Revert "Delete a Test File"""
Lw-KaiwB Nov 28, 2015
090a8bb
Revert "Revert "Revert "Revert "Delete a Test File""""
Lw-KaiwB Nov 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,6 +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","thress");
}
});

Expand Down