Merge "Update share UI to match redlines." into ics-factoryrom

17 files changed, 7 insertions, 2 deletions

diff --git a/res/drawable-hdpi/btn_ic_review_play.png b/res/drawable-hdpi/btn_ic_review_play.png
deleted file mode 100644
index 34a16e4..0000000
--- a/res/drawable-hdpi/btn_ic_review_play.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_gallery_play.png b/res/drawable-hdpi/ic_gallery_play.png
new file mode 100644
index 0000000..2ba9514
--- /dev/null
+++ b/res/drawable-hdpi/ic_gallery_play.png
diff --git a/res/drawable-hdpi/ic_highlight.9.png b/res/drawable-hdpi/ic_highlight.9.png
index e4cd688..ae766b9 100644
--- a/res/drawable-hdpi/ic_highlight.9.png
+++ b/res/drawable-hdpi/ic_highlight.9.png
diff --git a/res/drawable-hdpi/ic_switch_arrow.png b/res/drawable-hdpi/ic_switch_arrow.png
index 3461523..58b7a8c 100644
--- a/res/drawable-hdpi/ic_switch_arrow.png
+++ b/res/drawable-hdpi/ic_switch_arrow.png
diff --git a/res/drawable-mdpi/btn_ic_review_play.png b/res/drawable-mdpi/btn_ic_review_play.png
deleted file mode 100755
index c8d5e0d..0000000
--- a/res/drawable-mdpi/btn_ic_review_play.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_gallery_play.png b/res/drawable-mdpi/ic_gallery_play.png
new file mode 100644
index 0000000..38010cf
--- /dev/null
+++ b/res/drawable-mdpi/ic_gallery_play.png
diff --git a/res/drawable-mdpi/ic_highlight.9.png b/res/drawable-mdpi/ic_highlight.9.png
index 2c424c0..15bd741 100644
--- a/res/drawable-mdpi/ic_highlight.9.png
+++ b/res/drawable-mdpi/ic_highlight.9.png
diff --git a/res/drawable-mdpi/ic_switch_arrow.png b/res/drawable-mdpi/ic_switch_arrow.png
index b00bbc2..5de1925 100644
--- a/res/drawable-mdpi/ic_switch_arrow.png
+++ b/res/drawable-mdpi/ic_switch_arrow.png
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_review_play.png b/res/drawable-w1024dp-mdpi/btn_ic_review_play.png
deleted file mode 100755
index 6eca85c..0000000
--- a/res/drawable-w1024dp-mdpi/btn_ic_review_play.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_gallery_play.png b/res/drawable-xhdpi/ic_gallery_play.png
new file mode 100644
index 0000000..45c586b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_gallery_play.png
diff --git a/res/drawable-xhdpi/ic_highlight.9.png b/res/drawable-xhdpi/ic_highlight.9.png
index 875d89f..81dc33c 100644
--- a/res/drawable-xhdpi/ic_highlight.9.png
+++ b/res/drawable-xhdpi/ic_highlight.9.png
diff --git a/res/drawable-xhdpi/ic_switch_arrow.png b/res/drawable-xhdpi/ic_switch_arrow.png
index e9b46c4..76f1779 100644
--- a/res/drawable-xhdpi/ic_switch_arrow.png
+++ b/res/drawable-xhdpi/ic_switch_arrow.png
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index 8099d89..7cbc0a8 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -55,7 +55,6 @@
                 android:text="@string/bg_replacement_message" />
         <ImageButton android:id="@+id/btn_play"
                 style="@style/ReviewPlayIcon"
-                android:src="@drawable/btn_ic_review_play"
                 android:onClick="onPlayButtonClicked" />
         <ImageView android:id="@+id/review_image"
                 android:layout_width="match_parent"
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml
index e07de71..08c244b 100644
--- a/res/layout/preview_frame_video.xml
+++ b/res/layout/preview_frame_video.xml
@@ -43,7 +43,6 @@
                 android:visibility="gone"/>
         <ImageButton android:id="@+id/btn_play"
                 style="@style/ReviewPlayIcon"
-                android:src="@drawable/btn_ic_review_play"
                 android:onClick="onPlayButtonClicked"/>
         <ImageView android:id="@+id/review_image"
                 android:layout_width="match_parent"
diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index b4890da..1bae66b 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -51,6 +51,8 @@
                     android:layout_alignParentTop="true"
                     android:layout_alignParentLeft="true"
                     android:src="@drawable/ic_switch_arrow"/>
+            <ImageView android:id="@+id/play"
+                    style="@style/ReviewPlayIcon"/>
         </RelativeLayout>
         <FrameLayout
                 android:layout_width="@dimen/share_item_width"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cbb6329..ddd6371 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,6 +51,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_centerInParent">true</item>
         <item name="android:visibility">gone</item>
+        <item name="android:src">@drawable/ic_gallery_play</item>
     </style>
     <style name="RecordingTime">
         <item name="android:layout_width">wrap_content</item>
diff --git a/src/com/android/camera/ui/SharePopup.java b/src/com/android/camera/ui/SharePopup.java
index 4374d2d..9397591 100644
--- a/src/com/android/camera/ui/SharePopup.java
+++ b/src/com/android/camera/ui/SharePopup.java
@@ -119,6 +119,10 @@ public class SharePopup extends PopupWindow implements View.OnClickListener,
         mThumbnail.setImageBitmap(bitmap);
         mShareView = (ViewGroup) sharePopup.findViewById(R.id.share_view);
         mShareView.setOnClickListener(this);
+        // Show play button if this is a video thumbnail.
+        if (mMimeType.startsWith("video/")) {
+            sharePopup.findViewById(R.id.play).setVisibility(View.VISIBLE);
+        }
         mBitmapWidth = bitmap.getWidth();
         mBitmapHeight = bitmap.getHeight();
         Resources res = mContext.getResources();