diff options
| -rw-r--r-- | 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 d23d0f7ee..41f7dd971 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -43,7 +43,6 @@ import android.view.ViewGroup; import android.view.Window; import android.widget.RelativeLayout; import android.widget.Toast; -import android.widget.Toolbar; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; @@ -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 final PanoramaSupportCallback mUpdatePanoramaMenuItemsCallback = new PanoramaSupportCallback() { @Override public void panoramaInfoAvailable(MediaObject mediaObject, boolean isPanorama, @@ -916,7 +911,7 @@ public abstract class PhotoPage extends ActivityState implements mShowBars = true; mOrientationManager.unlockOrientation(); mActionBar.show(); - mActivity.getGLRoot().setLightsOutMode(true); + mActivity.getGLRoot().setLightsOutMode(false); refreshHidingMessage(); refreshBottomControlsWhenReady(); } @@ -1460,14 +1455,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); - } mActivity.getGLRoot().unfreeze(); mHandler.removeMessages(MSG_UNFREEZE_GLROOT); @@ -1592,16 +1579,6 @@ public abstract class PhotoPage extends ActivityState implements transitionFromAlbumPageIfNeeded(); mActivity.getGLRoot().freeze(); - 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); @@ -1625,8 +1602,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; |