summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-sw600dp/share_popup.xml47
-rw-r--r--res/layout/share_popup.xml62
-rw-r--r--res/values/styles.xml1
3 files changed, 59 insertions, 51 deletions
diff --git a/res/layout-sw600dp/share_popup.xml b/res/layout-sw600dp/share_popup.xml
index 900d646..96b39e1 100644
--- a/res/layout-sw600dp/share_popup.xml
+++ b/res/layout-sw600dp/share_popup.xml
@@ -26,34 +26,39 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center">
- <RelativeLayout android:id="@+id/share_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/border_last_picture">
- <com.android.camera.ui.RotateLayout
- android:id="@+id/thumbnail_rotate_layout"
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/thumbnail_rotate_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true">
+ <!-- The size of the thumbnail is calculated in SharePopup.java -->
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true">
- <!-- The size of the thumbnail is calculated in SharePopup.java -->
- <FrameLayout
+ android:layout_height="wrap_content" >
+ <com.android.camera.ui.StackLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<ImageView android:id="@+id/thumbnail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitCenter"/>
- <ImageView android:id="@+id/play"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:scaleType="center"
- style="@style/ReviewPlayIcon"/>
- </FrameLayout>
- </com.android.camera.ui.RotateLayout>
- </RelativeLayout>
+ <View
+ android:id="@+id/thumbnail_image_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="0dp"
+ android:background="@drawable/border_last_picture"
+ android:clickable="true"/>
+ </com.android.camera.ui.StackLayout>
+ <ImageView android:id="@+id/play"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:scaleType="center"
+ style="@style/ReviewPlayIcon"/>
+ </FrameLayout>
+ </com.android.camera.ui.RotateLayout>
<LinearLayout
android:layout_width="@dimen/share_item_width"
android:layout_height="match_parent"
diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index aa70cf9..19b2152 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -19,42 +19,46 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
- android:layout_height="match_parent"
android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@color/share_popup_background">
<FrameLayout android:id="@+id/root"
- android:layout_height="wrap_content"
android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="left|center">
- <RelativeLayout android:id="@+id/share_view"
- android:layout_height="wrap_content"
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/thumbnail_rotate_layout"
android:layout_width="wrap_content"
- android:layout_gravity="center"
- android:background="@drawable/border_last_picture">
- <com.android.camera.ui.RotateLayout
- android:id="@+id/thumbnail_rotate_layout"
- android:layout_height="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom">
+ <!-- The size of the thumbnail is calculated in SharePopup.java -->
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true">
- <!-- The size of the thumbnail is calculated in SharePopup.java -->
- <FrameLayout
+ android:layout_height="wrap_content" >
+ <com.android.camera.ui.StackLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<ImageView android:id="@+id/thumbnail"
- android:layout_height="wrap_content"
android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitCenter"/>
- <ImageView android:id="@+id/play"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:scaleType="center"
- style="@style/ReviewPlayIcon"/>
- </FrameLayout>
- </com.android.camera.ui.RotateLayout>
- </RelativeLayout>
+ <View
+ android:id="@+id/thumbnail_image_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="0dp"
+ android:background="@drawable/border_last_picture"
+ android:clickable="true"/>
+ </com.android.camera.ui.StackLayout>
+ <ImageView android:id="@+id/play"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:scaleType="center"
+ style="@style/ReviewPlayIcon"/>
+ </FrameLayout>
+ </com.android.camera.ui.RotateLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/share_item_height"
@@ -64,14 +68,14 @@
android:layout_alignParentRight="true"
android:id="@+id/goto_gallery_button_rotate"
android:layout_centerVertical="true"
- android:layout_height="match_parent"
- android:layout_width="@dimen/share_item_height">
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
<ImageButton
android:id="@+id/goto_gallery_button"
android:background="?android:attr/selectableItemBackground"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:scaleType="center"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:src="@drawable/ic_gallery" />
</com.android.camera.ui.RotateLayout>
<View
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 53e7a1c..e60b2a7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -246,7 +246,6 @@
</style>
<style name="OneRowGrid">
<item name="android:stretchMode">none</item>
- <item name="android:columnWidth">@dimen/share_item_width</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
generated by cgit v1.1 at 2024-05-13 19:07:00 +0000