summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/camera_control.xml27
-rw-r--r--res/layout/thumbnail_item.xml21
2 files changed, 36 insertions, 12 deletions
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index e1ca708..497da74 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -16,28 +16,30 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/control_bar"
- android:orientation="vertical"
android:layout_height="match_parent"
- android:layout_width="90dp"
+ android:layout_width="190dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_alignParentRight="true">
- <com.android.camera.RotateImageView
- android:id="@+id/review_thumbnail"
+ <ListView android:id="@+id/image_list"
+ android:layout_width="93dp"
+ android:layout_height="match_parent"
android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_height="70dp"
- android:layout_width="70dp"
- android:clickable="true"
- android:focusable="false"
- android:background="@drawable/border_last_picture"/>
+ android:layout_alignParentBottom="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:dividerHeight="10dp"
+ android:orientation="vertical"
+ android:gravity="center">
+ </ListView>
<com.android.camera.ShutterButton android:id="@+id/shutter_button"
android:layout_centerInParent="true"
- android:layout_centerHorizontal="true"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@id/image_list"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="center"
@@ -50,7 +52,8 @@
android:orientation="vertical"
android:gravity="center"
android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@id/image_list"
android:layout_height="wrap_content"
android:layout_width="wrap_content">
<com.android.camera.RotateImageView android:id="@+id/video_switch_icon"
diff --git a/res/layout/thumbnail_item.xml b/res/layout/thumbnail_item.xml
new file mode 100644
index 0000000..7f6522c
--- /dev/null
+++ b/res/layout/thumbnail_item.xml
@@ -0,0 +1,21 @@
+<?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:layout_alignParentTop="true"
+ android:layout_alignParentRight="true"
+ android:layout_height="90dp"
+ android:layout_width="90dp"
+ android:background="@drawable/border_last_picture"/>