diff options
author | Joey Rizzoli <joey@cyanogenmoditalia.it> | 2016-06-10 17:53:02 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-03-10 07:20:24 +0100 |
commit | 3ba1504ab22961f6f7f5d8fb75578fa1f90f1906 (patch) | |
tree | f66c21cbec46566d6b1cd3502000ad4a36738f80 | |
parent | 5872cf40df863f11b68abb9794ffe5306fd00712 (diff) | |
download | android_packages_apps_Gallery2-3ba1504ab22961f6f7f5d8fb75578fa1f90f1906.tar.gz android_packages_apps_Gallery2-3ba1504ab22961f6f7f5d8fb75578fa1f90f1906.tar.bz2 android_packages_apps_Gallery2-3ba1504ab22961f6f7f5d8fb75578fa1f90f1906.zip |
Gallery2: everyone or no one
hide statusbar only when toolbar is hidden
when viewing photo / video for better ui consistency
Change-Id: I64e3a951a13a765f38df83de290d9b0d167c90f7
Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>
-rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index ffc16db76..ed6dfa0b4 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -44,7 +44,6 @@ import android.view.Window; import android.view.WindowManager; import android.widget.RelativeLayout; import android.widget.Toast; -import android.widget.Toolbar; import org.codeaurora.gallery.R; @@ -208,10 +207,6 @@ public abstract class PhotoPage extends ActivityState implements private Intent mShareIntent; - //use for saving the original height and padding of toolbar - private int originalHeight = 0; - private int originalPadding = 0; - private ThreeDButton m3DButton; private boolean bShow3DButton; private LoadMpoDataTask mLoadMpoTask = new LoadMpoDataTask();; @@ -951,7 +946,7 @@ public abstract class PhotoPage extends ActivityState implements mShowBars = true; mOrientationManager.unlockOrientation(); mActionBar.show(); - mActivity.getGLRoot().setLightsOutMode(true); + mActivity.getGLRoot().setLightsOutMode(false); refreshHidingMessage(); refreshBottomControlsWhenReady(); } @@ -1518,14 +1513,6 @@ public abstract class PhotoPage extends ActivityState implements public void onPause() { super.onPause(); mIsActive = false; - //restore the orginal heigh and padding of toolbar - Toolbar toolbar = mActivity.getToolbar(); - if (toolbar != null) { - ViewGroup.LayoutParams layoutParams = toolbar.getLayoutParams(); - layoutParams.height = originalHeight; - toolbar.setLayoutParams(layoutParams); - toolbar.setPadding(0, originalPadding, 0, 0); - } showFullScreen(false); DetailsHelper.pause(); @@ -1646,16 +1633,6 @@ public abstract class PhotoPage extends ActivityState implements transitionFromAlbumPageIfNeeded(); - Toolbar toolbar = mActivity.getToolbar(); - //set the new height and padding to toolbar - if (toolbar != null) { - ViewGroup.LayoutParams layoutParams = toolbar.getLayoutParams(); - originalHeight = layoutParams.height; - originalPadding = toolbar.getPaddingTop(); - layoutParams.height = originalHeight - originalPadding; - toolbar.setPadding(0, 0, 0, 0); - toolbar.setLayoutParams(layoutParams); - } mIsActive = true; setContentPane(mRootPane); @@ -1678,8 +1655,6 @@ public abstract class PhotoPage extends ActivityState implements if (!mShowBars) { mActionBar.hide(); } - //hide the status bar - mActivity.getGLRoot().setLightsOutMode(true); boolean haveImageEditor = GalleryUtils.isEditorAvailable(mActivity, "image/*"); if (haveImageEditor != mHaveImageEditor) { mHaveImageEditor = haveImageEditor; |