diff options
author | nicolasroard <nicolasroard@google.com> | 2013-03-05 14:27:54 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-03-05 14:27:54 -0800 |
commit | 542c3832c24909c6f43b9b91fed4931a850b2fef (patch) | |
tree | 5fd17617d866486d067f3a20811cc3774eb100f7 /src/com/android/gallery3d/filtershow/FilterShowActivity.java | |
parent | 6aa73e7615a165c185778c238a7d6c73b6b56eff (diff) | |
download | android_packages_apps_Snap-542c3832c24909c6f43b9b91fed4931a850b2fef.tar.gz android_packages_apps_Snap-542c3832c24909c6f43b9b91fed4931a850b2fef.tar.bz2 android_packages_apps_Snap-542c3832c24909c6f43b9b91fed4931a850b2fef.zip |
Improves visual history
Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 518563a6d..4b5956530 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -872,7 +872,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, super.onConfigurationChanged(newConfig); setDefaultValues(); loadXML(); - mShowingImageStatePanel = true; + if (getResources().getConfiguration().orientation + == Configuration.ORIENTATION_LANDSCAPE) { + mShowingImageStatePanel = true; + } if (mShowingHistoryPanel) { toggleHistoryPanel(); } @@ -911,7 +914,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, if (mShowingImageStatePanel) { findViewById(R.id.imageStatePanel).setVisibility(View.GONE); - mShowingImageStatePanel = false; } int translate = translateMainPanel(viewList); @@ -919,6 +921,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mShowingHistoryPanel = true; if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + // If portrait, always remove the state panel + mShowingImageStatePanel = false; if (PanelController.useAnimations()) { view.animate().setDuration(200).x(translate) .withLayer().withEndAction(new Runnable() { @@ -938,6 +942,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, .alpha(1.0f).start(); } } else { + findViewById(R.id.filtersPanel).setVisibility(View.GONE); viewList.setVisibility(View.VISIBLE); } } else { @@ -953,6 +958,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, } } else { viewList.setVisibility(View.GONE); + findViewById(R.id.filtersPanel).setVisibility(View.VISIBLE); + // In landscape, bring back the state panel if it was there + if (mShowingImageStatePanel) { + findViewById(R.id.imageStatePanel).setVisibility(View.VISIBLE); + } } } invalidateOptionsMenu(); |