diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-05 13:57:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-05 13:57:26 -0800 |
| commit | 2228b65de460d7dad2fffcf1f97f78ee741fe3a9 (patch) | |
| tree | 1738fe2d3ac39c4ff61c6d9faf461d68736abb9a /res | |
| parent | 3aa330d614ca2d0f4c4f64d3f727278ead3b69e7 (diff) | |
| parent | 929d67931a209e6830b8b83d9a2a0f3dbd38c841 (diff) | |
| download | android_packages_apps_Snap-2228b65de460d7dad2fffcf1f97f78ee741fe3a9.tar.gz android_packages_apps_Snap-2228b65de460d7dad2fffcf1f97f78ee741fe3a9.tar.bz2 android_packages_apps_Snap-2228b65de460d7dad2fffcf1f97f78ee741fe3a9.zip | |
Merge "SnapdragonCamera: add features for 3rd-party apps" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rwxr-xr-x | res/layout/capture_module.xml | 53 | ||||
| -rwxr-xr-x | res/layout/one_ui_layout.xml | 20 |
2 files changed, 73 insertions, 0 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 44d5c59c6..84444597b 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -98,4 +98,57 @@ style="@style/CameraControls" layout="@layout/menu_help" android:layout_gravity="center" /> + + <FrameLayout + android:id="@+id/preview_of_intent" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="@android:color/black" + android:visibility="gone"> + <ImageView + android:id="@+id/preview_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:adjustViewBounds="true" + android:scaleType="fitXY"/> + + <ImageView + android:id="@+id/preview_play" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_gallery_play_big" + android:visibility="gone" + android:layout_gravity="center" /> + + <com.android.camera.ui.RotatableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CameraControls" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="2dip"> + <com.android.camera.ui.RotateImageView android:id="@+id/preview_btn_done" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_ok" + android:scaleType="center" + android:layout_gravity="right|bottom" + android:background="@drawable/bg_pressed" + android:src="@drawable/ic_menu_done_holo_light" /> + + <com.android.camera.ui.RotateImageView android:id="@+id/preview_btn_retake" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_retake" + android:layout_gravity="bottom|center_horizontal" + android:scaleType="center" + android:focusable="true" + android:background="@drawable/bg_pressed" + android:src="@drawable/ic_btn_shutter_retake" /> + + <com.android.camera.ui.RotateImageView android:id="@+id/preview_btn_cancel" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:scaleType="center" + android:layout_gravity="left|bottom" + android:background="@drawable/bg_pressed" + android:src="@drawable/ic_menu_cancel_holo_light" /> + </com.android.camera.ui.RotatableLayout> + </FrameLayout> </merge> diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index 53174698c..38322663a 100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -69,6 +69,26 @@ android:src="@drawable/btn_pause_recording"/> <com.android.camera.ui.RotateImageView + android:id="@+id/cancel_button" + android:layout_width="@dimen/one_ui_bottom_small" + android:layout_height="@dimen/one_ui_bottom_small" + android:clickable="true" + android:focusable="true" + android:scaleType="fitCenter" + android:visibility="gone" + android:src="@drawable/ic_menu_cancel_holo_light" /> + + <com.android.camera.PauseButton + android:id="@+id/video_pause" + android:layout_width="@dimen/one_ui_bottom_small" + android:layout_height="@dimen/one_ui_bottom_small" + android:focusable="true" + android:clickable="true" + android:scaleType="fitCenter" + android:visibility="gone" + android:src="@drawable/btn_pause_recording"/> + + <com.android.camera.ui.RotateImageView android:id="@+id/preview_thumb" android:layout_width="@dimen/capture_size" android:layout_height="@dimen/capture_size" |