Remove share icon and close arrow.

Alose increase the speed of icon rotation.

bug:5141343
bug:5141404
bug:5141514

Change-Id: I0db6b6edbc0fc1a0f83b4f29f6828bcff01bf0c4

6 files changed, 10 insertions, 28 deletions

diff --git a/res/drawable-hdpi/ic_viewfinder_share.jpg b/res/drawable-hdpi/ic_viewfinder_share.jpg
deleted file mode 100644
index 7a8949d..0000000
--- a/res/drawable-hdpi/ic_viewfinder_share.jpg
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_viewfinder_share.png b/res/drawable-mdpi/ic_viewfinder_share.png
deleted file mode 100644
index a73bec5..0000000
--- a/res/drawable-mdpi/ic_viewfinder_share.png
+++ /dev/null
diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_share.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_share.png
deleted file mode 100644
index d8f223a..0000000
--- a/res/drawable-w1024dp-mdpi/ic_viewfinder_share.png
+++ /dev/null
diff --git a/res/layout-w1024dp/review_thumbnail.xml b/res/layout-w1024dp/review_thumbnail.xml
index 0f8c4d1..d206997 100644
--- a/res/layout-w1024dp/review_thumbnail.xml
+++ b/res/layout-w1024dp/review_thumbnail.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/share_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+<com.android.camera.ui.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/thumbnail"
+        android:layout_width="86dp"
+        android:layout_height="86dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="@dimen/thumbnail_margin_top"
@@ -26,12 +26,4 @@
         android:clickable="true"
         android:focusable="false"
         android:background="@drawable/border_last_picture">
-    <com.android.camera.ui.RotateImageView android:id="@+id/share_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:src="@drawable/ic_viewfinder_share"
-            android:background="@android:color/black" />
-    <com.android.camera.ui.RotateImageView android:id="@+id/thumbnail"
-            android:layout_width="86dp"
-            android:layout_height="86dp"/>
-</LinearLayout>
\ No newline at end of file
+</com.android.camera.ui.RotateImageView>
\ No newline at end of file
diff --git a/res/layout/review_thumbnail.xml b/res/layout/review_thumbnail.xml
index ef5e821..0593307 100644
--- a/res/layout/review_thumbnail.xml
+++ b/res/layout/review_thumbnail.xml
@@ -14,17 +14,14 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/share_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+<com.android.camera.ui.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/thumbnail"
+        android:layout_width="52dp"
+        android:layout_height="52dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:orientation="vertical"
         android:clickable="true"
         android:focusable="false"
         android:background="@drawable/border_last_picture">
-    <com.android.camera.ui.RotateImageView android:id="@+id/thumbnail"
-            android:layout_width="52dp"
-            android:layout_height="52dp"/>
-</LinearLayout>
+</com.android.camera.ui.RotateImageView>
diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index 06b0e2a..5e5d2a2 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -79,12 +79,5 @@
                     android:scaleType="fitCenter"
                     android:background="@drawable/border_last_picture" />
         </com.android.camera.ui.RotateLayout>
-        <ImageView android:id="@+id/collapse_button"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:src="@drawable/btn_ic_review_play"
-                android:scaleType="center" />
     </RelativeLayout>
 </FrameLayout>