summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/bg_replacement_training_message.xml16
-rw-r--r--res/layout/camera.xml2
-rw-r--r--res/layout/camera_control.xml8
-rw-r--r--res/layout/effect_setting_item.xml2
-rw-r--r--res/layout/focus_indicator.xml6
-rw-r--r--res/layout/indicator_bar.xml45
-rw-r--r--res/layout/mode_picker.xml83
-rw-r--r--res/layout/on_screen_hint.xml6
-rw-r--r--res/layout/pano_capture.xml127
-rw-r--r--res/layout/pano_review.xml90
-rw-r--r--res/layout/pano_rotate_dialog.xml104
-rw-r--r--res/layout/panorama.xml5
-rw-r--r--res/layout/preview_frame_video.xml14
-rw-r--r--res/layout/priority_indicators.xml10
-rw-r--r--res/layout/review_control.xml14
-rw-r--r--res/layout/setting_item.xml2
-rw-r--r--res/layout/share_icon.xml12
-rw-r--r--res/layout/share_popup.xml60
-rw-r--r--res/layout/video_camera.xml10
-rw-r--r--res/layout/viewfinder_labels_video.xml4
20 files changed, 384 insertions, 236 deletions
diff --git a/res/layout/bg_replacement_training_message.xml b/res/layout/bg_replacement_training_message.xml
index 382c7c4..449e8df 100644
--- a/res/layout/bg_replacement_training_message.xml
+++ b/res/layout/bg_replacement_training_message.xml
@@ -16,20 +16,20 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bg_replace_message_frame"
- android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:visibility="gone"
android:onClick="onProtectiveCurtainClick"
android:background="#77000000">
<com.android.camera.ui.RotateLayout
android:id="@+id/bg_replace_message"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_centerInParent="true">
<LinearLayout
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:orientation="horizontal"
android:background="@drawable/dialog_full_holo_dark">
<TextView
android:layout_width="wrap_content"
@@ -39,13 +39,13 @@
android:padding="32dp" />
<View
- android:layout_width="match_parent"
- android:layout_height="1px"
+ android:layout_height="match_parent"
+ android:layout_width="1px"
android:background="#aaaaaa" />
<Button android:id="@+id/bg_replace_cancel_button"
- android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="match_parent"
+ android:layout_width="48dip"
android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"
style="?android:attr/borderlessButtonStyle"
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index bc9e313..939007a 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/app_root"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/preview_frame"/>
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index 366393d..3595849 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -16,15 +16,15 @@
<com.android.camera.ui.ControlPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/control_panel"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:minWidth="76dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="76dp"
android:background="@drawable/bg_camera_pattern">
<include layout="@layout/review_thumbnail" />
<include layout="@layout/review_control" />
<com.android.camera.ShutterButton android:id="@+id/shutter_button"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_centerInParent="true"
android:scaleType="center"
android:clickable="true"
diff --git a/res/layout/effect_setting_item.xml b/res/layout/effect_setting_item.xml
index 0b212c3..86d09dd 100644
--- a/res/layout/effect_setting_item.xml
+++ b/res/layout/effect_setting_item.xml
@@ -17,8 +17,8 @@
style="@style/EffectSettingItem">
<ImageView android:id="@+id/image"
- android:layout_width="@dimen/effect_setting_item_icon_width"
android:layout_height="@dimen/effect_setting_item_icon_width"
+ android:layout_width="@dimen/effect_setting_item_icon_width"
android:layout_gravity="center_horizontal"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />
diff --git a/res/layout/focus_indicator.xml b/res/layout/focus_indicator.xml
index 0e67061..9e66b40 100644
--- a/res/layout/focus_indicator.xml
+++ b/res/layout/focus_indicator.xml
@@ -16,10 +16,10 @@
<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/focus_indicator_rotate_layout"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_centerInParent="true">
<com.android.camera.ui.FocusIndicatorView android:id="@+id/focus_indicator"
- android:layout_width="120dp"
- android:layout_height="120dp"/>
+ android:layout_height="120dp"
+ android:layout_width="120dp"/>
</com.android.camera.ui.RotateLayout>
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index 764d6d6..33a8c7a 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -15,59 +15,58 @@
-->
<com.android.camera.ui.IndicatorControlBarContainer xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/indicator_control"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
android:clickable="true"
- android:layout_alignParentRight="true">
+ android:layout_alignParentBottom="true">
<RelativeLayout
android:id="@+id/control_bars"
- android:layout_toRightOf="@+id/zoom_index_bar"
- android:layout_width="@dimen/indicator_bar_width"
- android:layout_height="match_parent">
+ android:layout_height="@dimen/indicator_bar_width"
+ android:layout_width="match_parent">
<com.android.camera.ui.IndicatorControlBar
android:id="@+id/indicator_bar"
android:padding="8dp"
- android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_centerHorizontal="true">
+ android:layout_width="match_parent"
+ android:layout_centerVertical="true">
<com.android.camera.ui.ZoomControlBar
android:id="@+id/zoom_control"
- android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:visibility="gone" />
<com.android.camera.ui.RotateImageView
android:id="@+id/second_level_indicator_bar_icon"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_alignParentLeft="true"
android:contentDescription="@string/accessibility_second_level_indicators"
android:src="@drawable/ic_settings_holo_light" />
</com.android.camera.ui.IndicatorControlBar>
<com.android.camera.ui.SecondLevelIndicatorControlBar
android:id="@+id/second_level_indicator_bar"
- android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:layout_centerHorizontal="true"
+ android:layout_width="match_parent"
+ android:paddingRight="8dp"
+ android:paddingLeft="8dp"
+ android:layout_centerVertical="true"
android:background="@color/indicator_background"
android:visibility="gone">
<View android:id="@+id/divider"
- android:layout_width="match_parent"
- android:layout_height="1dp"
+ android:layout_height="match_parent"
+ android:layout_width="1dp"
android:background="@android:color/white" />
<View android:id="@+id/indicator_highlight"
- android:layout_alignParentLeft="true"
- android:layout_width="3dp"
- android:layout_height="0dp"
+ android:layout_alignParentTop="true"
+ android:layout_height="3dp"
+ android:layout_width="0dp"
android:background="@color/mode_selection_border"
android:visibility="gone" />
<com.android.camera.ui.ColorFilterImageView
android:id="@+id/back_to_first_level"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_back_to_first_level"
android:src="@drawable/btn_close_settings" />
</com.android.camera.ui.SecondLevelIndicatorControlBar>
diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml
index 12c9618..1b5e16b 100644
--- a/res/layout/mode_picker.xml
+++ b/res/layout/mode_picker.xml
@@ -15,90 +15,91 @@
-->
<com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mode_picker"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_alignParentLeft="true"
android:visibility="gone">
<RelativeLayout android:id="@+id/current_mode"
- android:orientation="vertical"
- android:layout_alignBottom="@+id/mode_selection"
- android:layout_width="match_parent"
- android:layout_height="55dp"
+ android:orientation="horizontal"
+ android:layout_alignLeft="@+id/mode_selection"
+ android:layout_height="match_parent"
+ android:layout_width="55dp"
android:contentDescription="@string/accessibility_mode_picker"
android:background="@drawable/bg_mode_picker">
- <View android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@android:color/white"/>
<RelativeLayout
- android:orientation="horizontal"
+ android:orientation="vertical"
android:contentDescription="@string/empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<com.android.camera.ui.RotateImageView android:id="@+id/mode_0"
+ android:layout_height="32dp"
android:layout_width="32dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="8dp"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="8dp"
android:scaleType="fitCenter"
android:contentDescription="@string/empty"
android:src="@drawable/ic_switch_video_holo_light" />
<com.android.camera.ui.RotateImageView android:id="@+id/mode_1"
+ android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:layout_centerInParent="true"
android:scaleType="fitCenter"
android:contentDescription="@string/empty"
android:src="@drawable/ic_switch_camera_holo_light" />
<com.android.camera.ui.RotateImageView android:id="@+id/mode_2"
+ android:layout_height="32dp"
android:layout_width="32dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentRight="true"
- android:layout_marginRight="8dp"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="8dp"
android:scaleType="fitCenter"
android:contentDescription="@string/empty"
android:src="@drawable/ic_switch_pan_holo_light" />
</RelativeLayout>
+ <View android:layout_height="match_parent"
+ android:layout_width="1dp"
+ android:layout_alignParentRight="true"
+ android:background="@android:color/white"/>
</RelativeLayout>
<RelativeLayout android:id="@+id/mode_selection"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="198dp"
+ android:orientation="horizontal"
+ android:layout_height="match_parent"
+ android:layout_width="198dp"
android:background="@drawable/bg_switcher"
android:visibility="gone">
- <View android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_alignParentTop="true"
- android:background="@color/mode_selection_border"/>
<LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true">
+ android:orientation="horizontal"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_centerHorizontal="true">
<com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
android:contentDescription="@string/switch_to_camera_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_marginRight="10dp"
android:scaleType="center"
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_switch_camera_holo_light" />
<com.android.camera.ui.RotateImageView android:id="@+id/mode_video"
android:contentDescription="@string/switch_to_video_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_marginRight="10dp"
android:scaleType="center"
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_switch_video_holo_light" />
<com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
android:contentDescription="@string/switch_to_panorama_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
android:scaleType="center"
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_switch_pan_holo_light" />
</LinearLayout>
+ <View android:layout_height="match_parent"
+ android:layout_width="1dp"
+ android:layout_alignParentRight="true"
+ android:background="@color/mode_selection_border"/>
</RelativeLayout>
</com.android.camera.ModePicker>
diff --git a/res/layout/on_screen_hint.xml b/res/layout/on_screen_hint.xml
index 312ff6d..b47a9e6 100644
--- a/res/layout/on_screen_hint.xml
+++ b/res/layout/on_screen_hint.xml
@@ -18,15 +18,15 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:orientation="horizontal"
android:background="@drawable/on_screen_hint_frame">
<TextView
android:id="@+id/message"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_weight="1"
android:textAppearance="@style/OnScreenHintTextAppearance.Small"
android:textColor="#ffffffff"
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index a91104a..d6430f4 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -16,42 +16,63 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pano_capture_layout"
- android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal">
+ android:layout_width="match_parent"
+ android:orientation="vertical">
<RelativeLayout android:id="@+id/frame_layout"
- android:layout_width="0dp"
- android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout android:id="@+id/pano_capture_preview"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="horizontal">
- <!-- The top bar with capture indication -->
- <FrameLayout android:id="@+id/pano_capture_indicator_layout"
- style="@style/PanoViewHorizontalBar">
+ <!-- The bottom bar with progress bar and direction indicators -->
+ <RelativeLayout
+ style="@style/PanoViewHorizontalBar">
- <TextView
- android:id="@+id/pano_capture_indicator"
- android:text="@string/pano_capture_indication"
- android:paddingTop="0dp"
- android:drawablePadding="5sp"
- android:drawableLeft="@drawable/ic_pan_recording_indicator"
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_pan_progress_bar_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <com.android.camera.panorama.PanoProgressBar
+ android:id="@+id/pano_pan_progress_bar"
+ android:visibility="gone"
+ android:src="@drawable/ic_pan_progression"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </com.android.camera.ui.RotateLayout>
+ <ImageView
+ android:id="@+id/pano_pan_left_indicator"
+ android:src="@drawable/pano_direction_left_indicator"
+ android:rotation="90"
android:visibility="gone"
- android:layout_marginLeft="16dp"
- android:layout_marginTop="16dp"
- android:layout_gravity="top|left"
+ android:layout_marginBottom="5dp"
+ android:layout_above="@id/pano_pan_progress_bar_layout"
+ android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
- </FrameLayout>
+
+ <ImageView
+ android:id="@+id/pano_pan_right_indicator"
+ android:src="@drawable/pano_direction_right_indicator"
+ android:rotation="90"
+ android:visibility="gone"
+ android:layout_marginTop="5dp"
+ android:layout_below="@id/pano_pan_progress_bar_layout"
+ android:layout_centerHorizontal="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </RelativeLayout>
<RelativeLayout
android:layout_gravity="center"
- android:layout_width="match_parent"
- android:layout_height="@dimen/pano_mosaic_surface_height">
+ android:layout_width="@dimen/pano_mosaic_surface_height"
+ android:layout_height="match_parent">
<com.android.camera.panorama.MosaicRendererSurfaceView
android:id="@+id/pano_renderer"
android:layout_width="match_parent"
@@ -62,50 +83,46 @@
android:background="@drawable/ic_pan_border_fast"
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
</RelativeLayout>
- <!-- The bottom bar with progress bar and direction indicators -->
- <RelativeLayout
- style="@style/PanoViewHorizontalBar">
- <com.android.camera.panorama.PanoProgressBar
- android:id="@+id/pano_pan_progress_bar"
- android:visibility="gone"
- android:src="@drawable/ic_pan_progression"
- android:layout_centerInParent="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- <ImageView
- android:id="@+id/pano_pan_left_indicator"
- android:src="@drawable/pano_direction_left_indicator"
- android:visibility="gone"
- android:layout_marginRight="5dp"
- android:layout_toLeftOf="@id/pano_pan_progress_bar"
- android:layout_centerVertical="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ <!-- The top bar with capture indication -->
+ <FrameLayout android:id="@+id/pano_capture_indicator_layout"
+ style="@style/PanoViewHorizontalBar"
+ android:padding="5dp">
- <ImageView
- android:id="@+id/pano_pan_right_indicator"
- android:src="@drawable/pano_direction_right_indicator"
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_capture_indicator"
android:visibility="gone"
- android:layout_marginLeft="5dp"
- android:layout_toRightOf="@id/pano_pan_progress_bar"
- android:layout_centerVertical="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </RelativeLayout>
+ android:layout_gravity="top|right"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <TextView
+ android:text="@string/pano_capture_indication"
+ android:paddingTop="0dp"
+ android:drawablePadding="5sp"
+ android:drawableLeft="@drawable/ic_pan_recording_indicator"
+ android:layout_marginLeft="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </com.android.camera.ui.RotateLayout>
+ </FrameLayout>
</LinearLayout>
<!-- The hint for "Too fast" text view-->
- <TextView android:id="@+id/pano_capture_too_fast_textview"
- android:text="@string/pano_too_fast_prompt"
- android:textAppearance="?android:textAppearanceMedium"
- android:layout_height="@dimen/pano_capture_too_fast_text_height"
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_capture_too_fast_textview_layout"
android:layout_width="wrap_content"
- android:visibility="gone"
- android:layout_centerInParent="true" />
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <TextView android:id="@+id/pano_capture_too_fast_textview"
+ android:text="@string/pano_too_fast_prompt"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_width="@dimen/pano_capture_too_fast_text_height"
+ android:layout_height="wrap_content"
+ android:visibility="gone" />
+ </com.android.camera.ui.RotateLayout>
</RelativeLayout>
<include layout="@layout/camera_control" />
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 5b9c2fc..2900a5a 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -17,47 +17,65 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pano_review_layout"
android:visibility="invisible"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:orientation="horizontal"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
- <LinearLayout android:id="@+id/pano_review_control"
- style="@style/PanoViewHorizontalBar"
- android:gravity="right"
- android:orientation="horizontal"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent">
-
- <TextView android:id="@+id/pano_review_cancel_button"
- android:text="@string/review_cancel"
- android:clickable="true"
- android:onClick="onCancelButtonClicked"
- android:textAppearance="?android:textAppearanceMedium"
- android:minWidth="@dimen/pano_review_button_width"
+ <RelativeLayout style="@style/PanoViewHorizontalBar">
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_review_saving_indication_layout"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="20dp"
android:layout_width="wrap_content"
- android:layout_height="@dimen/pano_review_button_height" />
- </LinearLayout>
+ android:layout_height="wrap_content">
+ <TextView android:id="@+id/pano_review_saving_indication"
+ android:text="@string/pano_review_saving_indication_str"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" />
+ </com.android.camera.ui.RotateLayout>
+
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_saving_progress_bar_layout"
+ android:layout_centerInParent="true"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
+ <com.android.camera.panorama.PanoProgressBar
+ android:id="@+id/pano_saving_progress_bar"
+ android:src="@drawable/ic_pan_progression"
+ android:layout_centerInParent="true"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" />
+ </com.android.camera.ui.RotateLayout>
+ </RelativeLayout>
<ImageView android:id="@+id/pano_reviewarea"
+ android:rotation="90"
android:scaleType="fitCenter"
- android:layout_width="match_parent"
- android:layout_height="@dimen/pano_mosaic_surface_height" />
+ android:layout_height="match_parent"
+ android:layout_width="@dimen/pano_mosaic_surface_height" />
- <RelativeLayout style="@style/PanoViewHorizontalBar">
- <TextView android:id="@+id/pano_review_saving_indication"
- android:text="@string/pano_review_saving_indication_str"
- android:textSize="@dimen/pano_review_saving_indication_size"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="20dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ <LinearLayout android:id="@+id/pano_review_control"
+ style="@style/PanoViewHorizontalBar"
+ android:gravity="bottom"
+ android:orientation="vertical"
+ android:layout_alignParentBottom="true"
+ android:layout_height="match_parent">
- <com.android.camera.panorama.PanoProgressBar
- android:id="@+id/pano_saving_progress_bar"
- android:src="@drawable/ic_pan_progression"
- android:layout_centerInParent="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </RelativeLayout>
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_review_cancel_button_layout"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <TextView android:id="@+id/pano_review_cancel_button"
+ android:text="@string/review_cancel"
+ android:clickable="true"
+ android:onClick="onCancelButtonClicked"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:minWidth="@dimen/pano_review_button_width"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" />
+ </com.android.camera.ui.RotateLayout>
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/pano_rotate_dialog.xml b/res/layout/pano_rotate_dialog.xml
new file mode 100644
index 0000000..456bb02
--- /dev/null
+++ b/res/layout/pano_rotate_dialog.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/rotate_dialog_layout"
+ android:visibility="gone"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" >
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/popup_background">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout android:id="@+id/rotate_dialog_title_layout"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/rotate_dialog_title"
+ style="@android:style/TextAppearance.Holo.DialogWindowTitle"
+ android:gravity="center_vertical"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="64dp"/>
+ <View android:id="@+id/rotate_dialog_title_divider"
+ layout_weight="bottom"
+ style="@style/PopupTitleSeperator" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/dialog_layout"
+ android:orientation="horizontal"
+ android:background="@color/popup_background"
+ android:padding="9dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <ProgressBar
+ android:id="@+id/rotate_dialog_spinner"
+ android:layout_gravity="center_vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView
+ style="@android:style/TextAppearance.Holo.Medium"
+ android:id="@+id/rotate_dialog_text"
+ android:layout_gravity="center_vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/rotate_dialog_button_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:minHeight="48dp"
+ android:orientation="vertical"
+ android:divider="@drawable/list_divider"
+ android:showDividers="beginning"
+ android:dividerPadding="0dip">
+
+ <Button android:id="@+id/rotate_dialog_button"
+ style="@android:style/Widget.Holo.Button.Borderless"
+ android:gravity="center"
+ android:text="@string/review_ok"
+ android:maxLines="2"
+ android:minHeight="48dp"
+ android:textSize="14sp"
+ android:onClick="onAlertDialogButtonClicked"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+ </LinearLayout>
+ </FrameLayout>
+ </com.android.camera.ui.RotateLayout>
+</FrameLayout>
diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml
index 2b25fe1..d56cca0 100644
--- a/res/layout/panorama.xml
+++ b/res/layout/panorama.xml
@@ -17,9 +17,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/pano_layout"
- android:layout_height="match_parent"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<include layout="@layout/pano_capture" />
<include layout="@layout/pano_review" />
+ <include layout="@layout/pano_rotate_dialog" />
</RelativeLayout>
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml
index af945f5..992eb46 100644
--- a/res/layout/preview_frame_video.xml
+++ b/res/layout/preview_frame_video.xml
@@ -16,25 +16,25 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/frame_layout"
- android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:layout_weight="1">
<com.android.camera.PreviewFrameLayout android:id="@+id/frame"
- android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:layout_centerInParent="true"
android:background="@drawable/border_preview">
<SurfaceView android:id="@+id/camera_preview"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:layout_width="match_parent" />
<com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"
style="@style/ViewfinderLableLayout">
<include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" />
</com.android.camera.ui.RotateLayout>
<ImageView android:id="@+id/review_image"
- android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:visibility="gone"
android:background="@android:color/black"/>
<com.android.camera.ui.RotateImageView
@@ -50,8 +50,8 @@
<!-- Fill up the space below preview frame with black. -->
<View
android:background="#ff000000"
- android:layout_width="match_parent"
- android:layout_height="0dip"
+ android:layout_height="match_parent"
+ android:layout_width="0dip"
android:layout_below="@+id/frame"
android:layout_alignParentBottom="true" />
diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml
index 4926484..794dfb8 100644
--- a/res/layout/priority_indicators.xml
+++ b/res/layout/priority_indicators.xml
@@ -14,20 +14,24 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_alignParentLeft="true"
+ android:orientation="vertical"
+ android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:padding="8dp">
<ImageView style="@style/OnScreenIndicator"
+ android:padding="1dp"
android:id="@+id/onscreen_gps_indicator_no_signal"
android:src="@drawable/ic_viewfinder_gps_no_signal"/>
<ImageView style="@style/OnScreenIndicator"
+ android:padding="1dp"
android:id="@+id/onscreen_gps_indicator_on"
android:src="@drawable/ic_viewfinder_gps_on"/>
<TextView style="@style/OnScreenIndicator"
android:id="@+id/onscreen_exposure_indicator"
+ android:layout_marginTop="6dp"
+ android:rotation="90.0"
android:gravity="center_vertical"
android:textSize="15dp"
android:textColor="@android:color/white"/>
diff --git a/res/layout/review_control.xml b/res/layout/review_control.xml
index 6a25d2c..d590dbd 100644
--- a/res/layout/review_control.xml
+++ b/res/layout/review_control.xml
@@ -16,18 +16,18 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/review_control"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<com.android.camera.ui.RotateImageView android:id="@+id/btn_done"
style="@style/ReviewControlIcon"
android:visibility="gone"
- android:layout_alignParentTop="true"
- android:layout_marginTop="20dp"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="20dp"
android:onClick="onReviewDoneClicked"
android:src="@drawable/ic_menu_done_holo_light" />
<ImageView android:id="@+id/btn_retake"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:focusable="true"
@@ -37,8 +37,8 @@
<com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel"
style="@style/ReviewControlIcon"
android:visibility="gone"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="20dp"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="20dp"
android:onClick="onReviewCancelClicked"
android:src="@drawable/ic_menu_cancel_holo_light" />
</RelativeLayout>
diff --git a/res/layout/setting_item.xml b/res/layout/setting_item.xml
index 5bcf3f7..3af3c3e 100644
--- a/res/layout/setting_item.xml
+++ b/res/layout/setting_item.xml
@@ -22,8 +22,8 @@
<TextView android:id="@+id/text"
style="@style/SettingItemTitle" />
<ImageView android:id="@+id/image"
- android:layout_width="@dimen/setting_item_icon_width"
android:layout_height="@dimen/setting_item_icon_width"
+ android:layout_width="@dimen/setting_item_icon_width"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />
</LinearLayout>
diff --git a/res/layout/share_icon.xml b/res/layout/share_icon.xml
index 7ab2e3b..17b2eef 100644
--- a/res/layout/share_icon.xml
+++ b/res/layout/share_icon.xml
@@ -14,14 +14,14 @@
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/share_item_height">
+ android:layout_height="@dimen/share_item_height"
+ android:layout_width="@dimen/share_item_width">
<com.android.camera.ui.RotateLayout android:id="@+id/share_icon_rotate_layout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:layout_gravity="center">
<ImageView android:id="@+id/icon"
- android:layout_width="@dimen/share_icon_length"
- android:layout_height="@dimen/share_icon_length"/>
+ android:layout_height="@dimen/share_icon_length"
+ android:layout_width="@dimen/share_icon_length"/>
</com.android.camera.ui.RotateLayout>
</FrameLayout>
diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index ccc74d9..d8035a0 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -19,30 +19,31 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
- android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:background="@color/share_popup_background">
<FrameLayout android:id="@+id/root"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_gravity="left|center">
<RelativeLayout android:id="@+id/share_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center"
android:background="@drawable/border_last_picture">
<com.android.camera.ui.RotateLayout
android:id="@+id/thumbnail_rotate_layout"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true">
+ android:layout_width="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true">
<!-- The size of the thumbnail is calculated in SharePopup.java -->
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<ImageView android:id="@+id/thumbnail"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitCenter"/>
<ImageView android:id="@+id/play"
@@ -52,40 +53,43 @@
android:scaleType="center"
style="@style/ReviewPlayIcon"/>
</FrameLayout>
- </com.android.camera.ui.RotateLayout>
+ </com.android.camera.ui.RotateLayout>
</RelativeLayout>
- <LinearLayout
- android:layout_width="@dimen/share_item_width"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:layout_gravity="right"
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/share_item_height"
+ android:layout_gravity="bottom"
android:background="@color/share_icon_background">
<com.android.camera.ui.RotateLayout
- android:layout_marginTop="8dip"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="8dip"
android:id="@+id/goto_gallery_button_rotate"
- android:layout_gravity="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_centerVertical="true"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content">
<ImageButton
android:id="@+id/goto_gallery_button"
android:background="?android:attr/selectableItemBackground"
android:layout_gravity="center"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:src="@drawable/ic_gallery" />
</com.android.camera.ui.RotateLayout>
<View
- android:layout_width="match_parent"
+ android:id="@+id/gallery_button_divider"
+ android:layout_toLeftOf="@+id/goto_gallery_button_rotate"
+ android:layout_height="match_parent"
android:layout_margin="8dip"
- android:layout_height="1dp"
+ android:layout_width="1dp"
android:background="#5affffff" />
- <ListView android:id="@+id/share_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:choiceMode="singleChoice"
- style="@android:style/Widget.Holo.ListView" />
- </LinearLayout>
+ <com.android.camera.ui.RightAlignedHorizontalScrollView android:id="@+id/share_list_container"
+ android:layout_toLeftOf="@+id/gallery_button_divider"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content">
+ <com.android.camera.ui.OneRowGridView android:id="@+id/share_list"
+ style="@style/OneRowGrid"/>
+ </com.android.camera.ui.RightAlignedHorizontalScrollView>
+ </RelativeLayout>
</FrameLayout>
</FrameLayout>
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 809c7a5..e8ae19a 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -17,12 +17,12 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/app_root"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:orientation="vertical"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<include layout="@layout/preview_frame_video"/>
<include layout="@layout/camera_control"/>
</LinearLayout>
diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml
index 9e9c892..75a4449 100644
--- a/res/layout/viewfinder_labels_video.xml
+++ b/res/layout/viewfinder_labels_video.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<TextView android:id="@+id/recording_time"
style="@style/OnViewfinderLabel"
android:gravity="center"
generated by cgit v1.1 at 2025-08-25 04:02:23 +0000