diff options
Diffstat (limited to 'src')
-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 b4b3d9052..eb1155eb8 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; @@ -209,10 +208,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 ParseGDepthTask mParseGDepthTask; @@ -964,7 +959,7 @@ public abstract class PhotoPage extends ActivityState implements mShowBars = true; mOrientationManager.unlockOrientation(); mActionBar.show(); - mActivity.getGLRoot().setLightsOutMode(true); + mActivity.getGLRoot().setLightsOutMode(false); refreshHidingMessage(); refreshBottomControlsWhenReady(); } @@ -1532,14 +1527,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(); @@ -1660,16 +1647,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); @@ -1692,8 +1669,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; |