commit 9b900e0d23a1a9c5b708424efe1a01b107bf774f
author Mangesh Ghiware <mghiware@google.com> Wed Oct 10 15:19:03 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 15:19:04 2012 -0700
tree 5c65806291884d14cb0942cda0e7b2ea35062525
parent db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b
parent 682163e115a8e679b3038f4cb9886851e12a4035

Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches

res/layout/action_bar_two_line_text.xml

diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml
index 37cb375..aeb9907 100644
--- a/res/layout/action_bar_two_line_text.xml
+++ b/res/layout/action_bar_two_line_text.xml
@@ -17,7 +17,7 @@
     android:paddingLeft="18dp"
     android:paddingRight="18dp"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:mode="twoLine"
@@ -25,7 +25,7 @@
 >
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/text1"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:ellipsize="end"
@@ -35,7 +35,7 @@
     />
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/text2"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="bottom"
         android:textAppearance="?android:attr/textAppearanceSmall"

src/com/android/gallery3d/app/AlbumPage.java

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 9cc56cc..c956bc9 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -299,6 +299,7 @@
                     PhotoPage.MSG_ALBUMPAGE_STARTED);
             data.putBoolean(PhotoPage.KEY_START_IN_FILMSTRIP,
                     startInFilmstrip);
+            data.putBoolean(PhotoPage.KEY_IN_CAMERA_ROLL, mMediaSet.isCameraRoll());
             mActivity.getStateManager().startStateForResult(
                     PhotoPage.class, REQUEST_PHOTO, data);
         }