diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-xlarge/camera.xml | 2 | ||||
| -rw-r--r-- | res/layout-xlarge/review_thumbnail.xml (renamed from res/layout-xlarge/thumbnail_list.xml) | 14 | ||||
| -rw-r--r-- | res/layout-xlarge/video_camera.xml | 3 | ||||
| -rw-r--r-- | res/layout/camera_control.xml | 10 | ||||
| -rw-r--r-- | res/layout/review_thumbnail.xml | 25 |
5 files changed, 37 insertions, 17 deletions
diff --git a/res/layout-xlarge/camera.xml b/res/layout-xlarge/camera.xml index 016423f..9367f98 100644 --- a/res/layout-xlarge/camera.xml +++ b/res/layout-xlarge/camera.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/thumbnail_list"/> + <include layout="@layout/review_thumbnail"/> <include layout="@layout/preview_frame"/> <include layout="@layout/camera_control"/> </LinearLayout> diff --git a/res/layout-xlarge/thumbnail_list.xml b/res/layout-xlarge/review_thumbnail.xml index 7d69436..6ded61f 100644 --- a/res/layout-xlarge/thumbnail_list.xml +++ b/res/layout-xlarge/review_thumbnail.xml @@ -14,10 +14,12 @@ limitations under the License. --> -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/thumbnail_list" +<com.android.camera.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/review_thumbnail" android:layout_width="96dp" - android:layout_height="match_parent" - android:dividerHeight="6dp" - android:orientation="vertical" - android:gravity="center"/> + android:layout_height="96dp" + android:layout_gravity="center" + android:layout_marginLeft="10dp" + android:clickable="true" + android:focusable="false" + android:background="@drawable/border_last_picture"/> diff --git a/res/layout-xlarge/video_camera.xml b/res/layout-xlarge/video_camera.xml index b8ac3ef..a0ae219 100644 --- a/res/layout-xlarge/video_camera.xml +++ b/res/layout-xlarge/video_camera.xml @@ -20,7 +20,8 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/thumbnail_list"/> + + <include layout="@layout/review_thumbnail"/> <include layout="@layout/preview_frame_video"/> <include layout="@layout/camera_control"/> </LinearLayout> diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index 0f6f22a..c89418e 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -22,15 +22,7 @@ android:layout_marginTop="13dp" android:layout_marginBottom="10dp"> - <com.android.camera.RotateImageView - android:id="@+id/review_thumbnail" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_height="52dp" - android:layout_width="52dp" - android:clickable="true" - android:focusable="false" - android:background="@drawable/border_last_picture"/> + <include layout="@layout/review_thumbnail"/> <LinearLayout android:id="@+id/camera_switch_set" android:orientation="vertical" diff --git a/res/layout/review_thumbnail.xml b/res/layout/review_thumbnail.xml new file mode 100644 index 0000000..1b9039c --- /dev/null +++ b/res/layout/review_thumbnail.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.android.camera.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/review_thumbnail" + android:layout_width="52dp" + android:layout_height="52dp" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:clickable="true" + android:focusable="false" + android:background="@drawable/border_last_picture" /> |