AI 143178: am: CL 142891 Fix issue 1578783. Show the on screen controlls when user tap on the screen

  so that it won't get dissapeared.
  Also fix layout issue in camera review mode. The shutter button is misplaced
  by 5 pixel in both X, Y coordinate.
  Use next/prev buttons to go to next/prev images in all cases. Also set the
  height these buttons as screen's height so that it works as same as before.
  Original author: owenlin
  Merged from: //branches/cupcake/...

Automated import of CL 143178

1 files changed, 116 insertions, 117 deletions

diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml
index b0d2034..a25375f 100644
--- a/res/layout/viewimage.xml
+++ b/res/layout/viewimage.xml
@@ -15,146 +15,145 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rootLayout"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
+        android:id="@+id/rootLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
 
-	<AbsoluteLayout android:id="@+id/slideShowContainer"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
-		 	    <view android:id="@+id/image1_slideShow"
-					class="com.android.camera.ViewImage$ImageViewTouch"
-	    			android:background="#00000000"
-	    			android:layout_width="fill_parent"
-		    		android:layout_height="fill_parent"
-	    		/>
-		 	    <view android:id="@+id/image2_slideShow"
-					class="com.android.camera.ViewImage$ImageViewTouch"
-	    			android:background="#00000000"
-	    			android:layout_width="fill_parent"
-		    		android:layout_height="fill_parent"
-	    		/>
-	</AbsoluteLayout>	
+    <AbsoluteLayout android:id="@+id/slideShowContainer"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+        <view android:id="@+id/image1_slideShow"
+                class="com.android.camera.ViewImage$ImageViewTouch"
+                android:background="#00000000"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+        />
+         <view android:id="@+id/image2_slideShow"
+                class="com.android.camera.ViewImage$ImageViewTouch"
+                android:background="#00000000"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+        />
+    </AbsoluteLayout>    
+
+    <AbsoluteLayout android:id="@+id/abs"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+        <view class="com.android.camera.ViewImage$ScrollHandler" android:id="@+id/scroller"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="horizontal"
+                android:background="#FF000000"
+                android:layout_x="0dip"
+                android:layout_y="0dip">
+               
+        <view android:id="@+id/image1"
+                class="com.android.camera.ViewImage$ImageViewTouch"
+                android:background="#FF000000"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent" />
+    
+        <View android:id="@+id/padding1"
+                android:layout_height="fill_parent"
+                android:layout_width="0dip" />
+            
+        <view android:id="@+id/image2"
+                class="com.android.camera.ViewImage$ImageViewTouch"
+                android:background="#FF000000"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"/>
+
+        <View android:id="@+id/padding2"
+                android:layout_height="fill_parent"
+                android:layout_width="0dip" />
+    
+        <view android:id="@+id/image3"
+                class="com.android.camera.ViewImage$ImageViewTouch"
+                android:background="#FF000000"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"/>
+        </view>
+    </AbsoluteLayout>
+    
+    <ImageView android:id="@+id/prev_image"
+            android:clickable="true"
+            android:layout_width="wrap_content" android:layout_height="fill_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:visibility="invisible"
+            android:src="@drawable/btn_camera_arrow_left"
+    />
 
-	<AbsoluteLayout android:id="@+id/abs"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
-		<view class="com.android.camera.ViewImage$ScrollHandler" android:id="@+id/scroller"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:orientation="horizontal"
-			
-	   		android:background="#FF000000"
-	   		android:layout_x="0dip"
-	   		android:layout_y="0dip">
-	   		
-		 	    <view android:id="@+id/image1"
-					class="com.android.camera.ViewImage$ImageViewTouch"
-	    			android:background="#FF000000"
-	    			android:layout_width="0dip"
-		    		android:layout_height="fill_parent" />
-	    	
-		    	<View android:id="@+id/padding1"
-	 		   		android:layout_height="fill_parent"
-		    		android:layout_width="0dip" />
-			    	
-		 	    <view android:id="@+id/image2"
-					class="com.android.camera.ViewImage$ImageViewTouch"
-	    			android:background="#FF000000"
-	    			android:layout_width="0dip"
-	    			android:layout_height="fill_parent"/>
+    <ImageView android:id="@+id/next_image"
+            android:clickable="true"
+            android:layout_width="wrap_content" android:layout_height="fill_parent"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:visibility="invisible"
+            android:src="@drawable/btn_camera_arrow_right"
+    />
 
-		    	<View android:id="@+id/padding2"
-		    		android:layout_height="fill_parent"
-		    		android:layout_width="0dip" />
-	    	
-		 	    <view android:id="@+id/image3"
-					class="com.android.camera.ViewImage$ImageViewTouch"
-	    			android:background="#FF000000"
-	    			android:layout_width="0dip"
-		    		android:layout_height="fill_parent"/>
-		</view>
-	</AbsoluteLayout>
-	
-	<ImageView
-        android:visibility="gone"
-		android:id="@+id/shutter_button"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:src="@drawable/ic_camera_indicator_photo"
-		android:background="@drawable/ic_btn_camera_background"
-		android:clickable="true"
-		android:focusable="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dip"
-        android:layout_marginTop="10dip"
-		android:scaleType="center"/>
-	
+    <ImageView
+            android:visibility="gone"
+            android:id="@+id/shutter_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_camera_indicator_photo"
+            android:background="@drawable/ic_btn_camera_background"
+            android:clickable="true"
+            android:focusable="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="5dip"
+            android:scaleType="center"/>
+    
     <LinearLayout
             android:visibility="gone"
             android:id="@+id/action_icon_panel"
-			android:layout_alignBottom="@id/shutter_button"
-			android:layout_toLeftOf="@id/shutter_button"
+            android:layout_alignBottom="@id/shutter_button"
+            android:layout_toLeftOf="@id/shutter_button"
             android:layout_marginRight="38dip"
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
         <com.android.camera.ActionMenuButton
-            android:id="@+id/gallery"
-            android:drawableTop="@drawable/ic_menu_gallery"
-            android:text="@string/camera_gallery"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/gallery"
+                android:drawableTop="@drawable/ic_menu_gallery"
+                android:text="@string/camera_gallery"
+                style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
-            android:id="@+id/setas"
-            android:drawableTop="@drawable/ic_menu_set_as"
-            android:text="@string/camera_set"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/setas"
+                android:drawableTop="@drawable/ic_menu_set_as"
+                android:text="@string/camera_set"
+                style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
-            android:id="@+id/share"
-            android:drawableTop="@drawable/ic_menu_share"
-            android:text="@string/camera_share"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/share"
+                android:drawableTop="@drawable/ic_menu_share"
+                android:text="@string/camera_share"
+                style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
-            android:id="@+id/discard"
-            android:drawableTop="@drawable/ic_menu_delete"
-            android:text="@string/camera_toss"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/discard"
+                android:drawableTop="@drawable/ic_menu_delete"
+                android:text="@string/camera_toss"
+                style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
-            android:id="@+id/attach"
-            android:drawableTop="@drawable/ic_menu_attach"
-            android:text="@string/camera_attach"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/attach"
+                android:drawableTop="@drawable/ic_menu_attach"
+                android:text="@string/camera_attach"
+                style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
-            android:id="@+id/cancel"
-            android:drawableTop="@drawable/ic_menu_cancel"
-            android:text="@string/camera_cancel"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/cancel"
+                android:drawableTop="@drawable/ic_menu_cancel"
+                android:text="@string/camera_cancel"
+                style="@style/OnscreenActionIcon"
         />
     </LinearLayout>
-	<ImageView android:id="@+id/prev_image"
-		android:clickable="true"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_alignParentLeft="true"
-		android:layout_centerVertical="true"
-		android:visibility="invisible"
-		android:src="@drawable/btn_camera_arrow_left"
-	/>
-
-	<ImageView android:id="@+id/next_image"
-		android:clickable="true"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:visibility="invisible"
-		android:src="@drawable/btn_camera_arrow_right"
-	/>
-
 </RelativeLayout>