Skip to content
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.

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

Issue 209 wake #280

Merged
merged 3 commits into from
Mar 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Javadocs are [here](http://moagrius.github.io/TileView/index.html?com/qozix/tile
###Installation
Gradle:
```
compile 'com.qozix:tileview:2.1.1'
compile 'com.qozix:tileview:2.1.2'
```

The library is hosted on jcenter, and is not currently available from maven.
Expand All @@ -52,7 +52,7 @@ A demo application, built in Android Studio, is available in the `demo` folder o
at the 2nd column from left and 3rd row from top.
1. Create a new application with a single activity ('Main').
1. Save the image tiles to your `assets` directory.
1. Add `compile 'com.qozix:tileview:2.1.1'` to your gradle dependencies.
1. Add `compile 'com.qozix:tileview:2.1.2'` to your gradle dependencies.
1. In the Main Activity, use this for `onCreate`:
```
@Override
Expand Down
2 changes: 1 addition & 1 deletion tileview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
minSdkVersion 11
targetSdkVersion 22
versionCode 27
versionName "2.1.1"
versionName "2.1.2"
}
buildTypes {
release {
Expand Down
8 changes: 0 additions & 8 deletions tileview/src/main/java/com/qozix/tileview/TileView.java
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,7 @@ public Paint getDefaultPathPaint() {
* appropriate for Activity.onPause.
*/
public void pause() {
mTileCanvasViewGroup.clear();
mRenderThrottleHandler.clear();
mCompositePathView.setShouldDraw( false );
mDetailLevelManager.invalidateAll();
setWillNotDraw( true );
}
Expand All @@ -702,7 +700,6 @@ public void destroy() {
public void resume() {
setWillNotDraw( false );
updateViewport();
mCompositePathView.setShouldDraw( true );
mTileCanvasViewGroup.updateTileSet( mDetailLevelManager.getCurrentDetailLevel() );
requestRender();
requestLayout();
Expand Down Expand Up @@ -916,11 +913,6 @@ public void onRestoreInstanceState(Parcelable state) {
final SavedState ss = (SavedState) state;
super.onRestoreInstanceState( ss.getSuperState() );
setScale( ss.mScale );

/*
* This is important to schedule a scroll change and not do it right away, as it won't work
* otherwise.
*/
post(new Runnable() {
@Override
public void run() {
Expand Down