aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/cyanogenmod
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-08-12 17:49:43 +0200
committerJorge Ruesga <jorge@ruesga.com>2013-08-12 17:49:43 +0200
commit96458b6c2cdbcc0c8540b34f5f6abee3ade3a6b7 (patch)
treeaa490618a38b90d27add729ec7e3361320d8f922 /src/org/cyanogenmod
parent045d68796d566b0b47209475fbb5284b6e51d310 (diff)
downloadandroid_packages_wallpapers_PhotoPhase-96458b6c2cdbcc0c8540b34f5f6abee3ade3a6b7.tar.gz
android_packages_wallpapers_PhotoPhase-96458b6c2cdbcc0c8540b34f5f6abee3ade3a6b7.tar.bz2
android_packages_wallpapers_PhotoPhase-96458b6c2cdbcc0c8540b34f5f6abee3ade3a6b7.zip
Dispositions: Restore to the last user setting instead of default one
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src/org/cyanogenmod')
-rw-r--r--src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java
index f078573..b0204c3 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java
@@ -55,7 +55,6 @@ public abstract class DispositionFragment
/*package*/ DispositionView mDispositionView;
- private boolean mRestored;
private MenuItem mDeleteMenu;
/**
@@ -136,14 +135,14 @@ public abstract class DispositionFragment
super.onDestroyView();
if (mDispositionView != null) {
mDispositionView.removeCallbacks(mRedraw);
- if (mRestored || mDispositionView.isChanged()) {
+ if (mDispositionView.isChanged()) {
saveDispositions(mDispositionView.getDispositions());
}
}
// Notify that the settings was changed
Intent intent = new Intent(PreferencesProvider.ACTION_SETTINGS_CHANGED);
- if (mRestored || mDispositionView.isChanged()) {
+ if (mDispositionView.isChanged()) {
intent.putExtra(PreferencesProvider.EXTRA_FLAG_REDRAW, Boolean.TRUE);
intent.putExtra(PreferencesProvider.EXTRA_FLAG_RECREATE_WORLD, Boolean.TRUE);
}
@@ -186,8 +185,7 @@ public abstract class DispositionFragment
* Method that restores the disposition view to the default state
*/
private void restoreData() {
- mDispositionView.setDispositions(getDefaultDispositions(), getCols(), getRows());
- mRestored = true;
+ mDispositionView.setDispositions(getUserDispositions(), getCols(), getRows());
}
/**