diff options
author | Angus Kong <shkong@google.com> | 2012-02-18 06:04:50 +0800 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2012-02-18 07:48:05 +0800 |
commit | efa3f22e42b31bfcf916610e01efe0bdc4940080 (patch) | |
tree | 88ba8aba26c6bdfc02ce7945f5cb8aba97e32d28 /res | |
parent | cb9bcc4c6444cb32509caa3c80461d247e7060ae (diff) | |
download | LegacyCamera-efa3f22e42b31bfcf916610e01efe0bdc4940080.zip LegacyCamera-efa3f22e42b31bfcf916610e01efe0bdc4940080.tar.gz LegacyCamera-efa3f22e42b31bfcf916610e01efe0bdc4940080.tar.bz2 |
Fix the share popup. DO NOT MERGE
Fix the share popup to comply with the new design:
1. Black background.
2. Image is centered.
3. Share popup won't rotate automatically.
bug:6031042
Change-Id: I86b15a19bc8f7598d444cd9032960ea02e251668
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-sw600dp/share_popup.xml | 6 | ||||
-rw-r--r-- | res/layout/share_popup.xml | 5 | ||||
-rw-r--r-- | res/values/colors.xml | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/res/layout-sw600dp/share_popup.xml b/res/layout-sw600dp/share_popup.xml index 96b39e1..e12f521 100644 --- a/res/layout-sw600dp/share_popup.xml +++ b/res/layout-sw600dp/share_popup.xml @@ -25,12 +25,14 @@ <FrameLayout android:id="@+id/root" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left|center"> + android:layout_gravity="left|center" + android:background="@color/share_popup_blackout"> <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"> + android:layout_alignParentRight="true" + android:layout_gravity="center"> <!-- The size of the thumbnail is calculated in SharePopup.java --> <FrameLayout android:layout_width="wrap_content" diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml index 087d8c7..f8cb5e5 100644 --- a/res/layout/share_popup.xml +++ b/res/layout/share_popup.xml @@ -25,12 +25,13 @@ <FrameLayout android:id="@+id/root" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="top|center"> + android:layout_gravity="top|center" + android:background="@color/share_popup_blackout"> <com.android.camera.ui.RotateLayout android:id="@+id/thumbnail_rotate_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom"> + android:layout_gravity="center"> <!-- The size of the thumbnail is calculated in SharePopup.java --> <FrameLayout android:layout_width="wrap_content" diff --git a/res/values/colors.xml b/res/values/colors.xml index d595c60..6085301 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -27,7 +27,7 @@ <color name="time_lapse_arc">#FFC5C5C5</color> <color name="dark_gray">#151515</color> <color name="share_popup_background">#DA000000</color> - <color name="share_popup_blackout">#ff222222</color> + <color name="share_popup_blackout">#ff090909</color> <color name="share_icon_background">#80000000</color> <color name="indicator_background">#40000000</color> <color name="popup_title_color">#ff33b5e5</color> |