summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-04-07 02:16:00 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-04-07 02:16:00 -0700
commitfc2eb4862e6c48c406470cfc9885775dec76b0b7 (patch)
tree10049417b69098bdf912eb44f575fe393db34169
parenta731e09f6b6d4e0d0d13640610d4834d4f12e650 (diff)
parent57d76b0bd4ad35df7d0dd9e2cfedddc4126368b3 (diff)
downloadandroid_packages_apps_Gallery2-fc2eb4862e6c48c406470cfc9885775dec76b0b7.tar.gz
android_packages_apps_Gallery2-fc2eb4862e6c48c406470cfc9885775dec76b0b7.tar.bz2
android_packages_apps_Gallery2-fc2eb4862e6c48c406470cfc9885775dec76b0b7.zip
Merge "Gallery2: Fix actionbar hide in timeline page." into android_ui.lnx.1.2-dev
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index e5cf6a731..4ea2e483d 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -992,6 +992,9 @@ public abstract class PhotoPage extends ActivityState implements
"drawer");
mActivity.getToolbar().setNavigationIcon(R.drawable.drawer);
((GalleryActivity)mActivity).toggleNavDrawer(true);
+ if (mModel instanceof PhotoDataAdapter) {
+ ((PhotoDataAdapter) mModel).setDataListener(null);
+ }
}
}
}