Gallery: Modify some layout according to UX.

1. change MovieActivity Theme.
2. change toolbar's theme.
3. modify Straighten editor layout.
4. modify click effect of "Video Snapshot" and "Editor Comparison".
5. modify layout of trim video's timebar.
6. change video gesture's max to 1min.
7. fix the selected picture is not selected after onPause() in AlbumPage.

Change-Id: Ief77f0efa3c9c1134eb3032992c797218a46db46
CRs-Fixed: 1032085

6 files changed, 18 insertions, 17 deletions

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 05cc1f8a1..0ff76e751 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -529,9 +529,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         super.onPause();
         mIsActive = false;
 
-        if (mSelectionManager.inSelectionMode()) {
-            mSelectionManager.leaveSelectionMode();
-        }
         mAlbumView.setSlotFilter(null);
         mActionModeHandler.pause();
         mAlbumDataAdapter.pause();
diff --git a/src/com/android/gallery3d/app/GestureControllerOverlay.java b/src/com/android/gallery3d/app/GestureControllerOverlay.java
index fee9b3ab5..c7f497d16 100644
--- a/src/com/android/gallery3d/app/GestureControllerOverlay.java
+++ b/src/com/android/gallery3d/app/GestureControllerOverlay.java
@@ -49,7 +49,7 @@ public class GestureControllerOverlay extends FrameLayout implements
         ControllerOverlay, GestureController.GestureControlListener {
     private GestureController mGestureController;
 
-    private static final int MAX_VIDEO_STEP_TIME = 2 * 60 * 1000;
+    private static final int MAX_VIDEO_STEP_TIME = 60 * 1000;
     private static final int MAX_BRIGHTNESS = 100;
 
     private float mStartBrightness = -1.0f;
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlayNew.java b/src/com/android/gallery3d/app/MovieControllerOverlayNew.java
index 824f8a469..6b32c142a 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlayNew.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlayNew.java
@@ -164,7 +164,7 @@ public class MovieControllerOverlayNew extends MovieControllerOverlay {
             LayoutParams wrapContent =
                     new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
             mVideoSnapshotButton = new ImageView(context);
-            mVideoSnapshotButton.setImageResource(R.drawable.ic_video_snapshot_padding);
+            mVideoSnapshotButton.setImageResource(R.drawable.ic_video_snapshot_selector);
             mVideoSnapshotButton.setScaleType(ImageView.ScaleType.CENTER);
             mVideoSnapshotButton.setFocusable(true);
             mVideoSnapshotButton.setClickable(true);
diff --git a/src/com/android/gallery3d/app/TrimTimeBar.java b/src/com/android/gallery3d/app/TrimTimeBar.java
index 06e8741bb..6fea3d690 100644
--- a/src/com/android/gallery3d/app/TrimTimeBar.java
+++ b/src/com/android/gallery3d/app/TrimTimeBar.java
@@ -83,11 +83,11 @@ public class TrimTimeBar extends TimeBar {
     }
 
     private int trimStartScrubberTipOffset() {
-        return mTrimStartScrubber.getWidth() * 3 / 4;
+        return mTrimStartScrubber.getWidth();
     }
 
     private int trimEndScrubberTipOffset() {
-        return mTrimEndScrubber.getWidth() / 4;
+        return 0;
     }
 
     // Based on all the time info (current, total, trimStart, trimEnd), we
@@ -153,9 +153,10 @@ public class TrimTimeBar extends TimeBar {
     }
 
     private boolean inScrubber(float x, float y, int startX, int startY, Bitmap scrubber) {
-        int scrubberRight = startX + scrubber.getWidth();
-        int scrubberBottom = startY + scrubber.getHeight();
-        return startX < x && x < scrubberRight && startY < y && y < scrubberBottom;
+        int scrubberRight = startX + scrubber.getWidth() * 2;
+        int scrubberBottom = startY + scrubber.getHeight() * 2;
+        return startX - mScrubberPadding < x && x < scrubberRight + mScrubberPadding
+                && startY - mScrubberPadding < y && y < scrubberBottom + mScrubberPadding;
     }
 
     private int clampScrubber(int scrubberLeft, int offset, int lowerBound, int upperBound) {
@@ -182,12 +183,12 @@ public class TrimTimeBar extends TimeBar {
             }
             margin = mLayoutExt.getProgressMargin(margin);
             int progressY = (h + mScrubberPadding) / 2;
-            mTrimStartScrubberTop = progressY;
-            mTrimEndScrubberTop = progressY;
             mScrubberTop = progressY - mScrubber.getHeight() / 2 + 1;
             mProgressBar.set(
                     mTimeBarMargin + margin, progressY,
                     w - mTimeBarMargin - margin, progressY + 6);
+            mTrimStartScrubberTop = progressY + mProgressBar.height();
+            mTrimEndScrubberTop = progressY + mProgressBar.height();
         }
         update();
     }
@@ -341,6 +342,6 @@ public class TrimTimeBar extends TimeBar {
                     break;
             }
         }
-        return false;
+        return true;
     }
 }
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java
index d2d6cd336..ec85de234 100644
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -122,7 +122,7 @@ public class TrimVideo extends Activity implements
                 trimVideo();
             }
         });
-        mSaveVideoTextView.setEnabled(false);
+        mSaveVideoTextView.setVisibility(View.GONE);
 
         Intent intent = getIntent();
         mUri = intent.getData();
@@ -232,7 +232,7 @@ public class TrimVideo extends Activity implements
         }
         mController.setTimes(mVideoPosition, duration, mTrimStartTime, mTrimEndTime);
         // Enable save if there's modifications
-        mSaveVideoTextView.setEnabled(isModified());
+        mSaveVideoTextView.setVisibility(isModified() ? View.VISIBLE : View.GONE);
         return mVideoPosition;
     }
 
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
index cec45f15f..d83c0ad75 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
@@ -29,6 +29,7 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import org.codeaurora.gallery.R;
 import com.android.gallery3d.filtershow.crop.CropDrawingUtils;
 import com.android.gallery3d.filtershow.editors.EditorStraighten;
 import com.android.gallery3d.filtershow.filters.FilterCropRepresentation;
@@ -257,9 +258,11 @@ public class ImageStraighten extends ImageShow {
         int viewWidth = canvas.getWidth();
         int viewHeight = canvas.getHeight();
 
+        int panelHeight = getContext().getResources().getDimensionPixelOffset(
+                R.dimen.category_actionbar_panel_height);
         // Get matrix for drawing bitmap
         Matrix m = GeometryMathUtils.getFullGeometryToScreenMatrix(mDrawHolder, imageWidth,
-                imageHeight, viewWidth, viewHeight);
+                imageHeight, viewWidth, viewHeight - panelHeight);
         mPaint.reset();
         mPaint.setAntiAlias(true);
         mPaint.setFilterBitmap(true);
@@ -270,7 +273,7 @@ public class ImageStraighten extends ImageShow {
         mPaint.setStrokeWidth(2);
         mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
         updateCurrentCrop(m, mDrawHolder, mDrawRect, imageWidth,
-                imageHeight, viewWidth, viewHeight);
+                imageHeight, viewWidth, viewHeight - panelHeight);
         if (mFirstDrawSinceUp) {
             mPriorCropAtUp.set(mCrop);
             mLocalRep.setStraighten(mAngle);