summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChih-Chung Chang <>2009-04-12 21:42:43 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-12 21:42:43 -0700
commit7db87ab06d97b8e57df5b10ab2b3dc554ac5eee2 (patch)
tree91f2c3841b908ccad34d6cbd38f203fbe9fc05d4 /res
parent84b4787df0163b621fb06de734f16b02f486ff18 (diff)
downloadLegacyCamera-7db87ab06d97b8e57df5b10ab2b3dc554ac5eee2.zip
LegacyCamera-7db87ab06d97b8e57df5b10ab2b3dc554ac5eee2.tar.gz
LegacyCamera-7db87ab06d97b8e57df5b10ab2b3dc554ac5eee2.tar.bz2
AI 145815: Simplify ViewImage.
Automated import of CL 145815
Diffstat (limited to 'res')
-rw-r--r--res/layout/viewimage.xml39
1 files changed, 5 insertions, 34 deletions
diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml
index 18229ea..09e8236 100644
--- a/res/layout/viewimage.xml
+++ b/res/layout/viewimage.xml
@@ -23,13 +23,13 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<view android:id="@+id/image1_slideShow"
- class="com.android.camera.ImageViewTouch"
+ class="com.android.camera.ImageViewTouchBase"
android:background="#00000000"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
/>
- <view android:id="@+id/image2_slideShow"
- class="com.android.camera.ImageViewTouch"
+ <view android:id="@+id/image2_slideShow"
+ class="com.android.camera.ImageViewTouchBase"
android:background="#00000000"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -39,40 +39,11 @@
<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"
+ <view android:id="@+id/image"
class="com.android.camera.ImageViewTouch"
android:background="#FF000000"
- android:layout_width="0dip"
+ android:layout_width="fill_parent"
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.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.ImageViewTouch"
- android:background="#FF000000"
- android:layout_width="0dip"
- android:layout_height="fill_parent"/>
- </view>
</AbsoluteLayout>
<ImageView android:id="@+id/prev_image"