summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2017-09-22 13:44:33 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-06 19:04:50 -0800
commitcfdc874eb6e23e101bd32d10183e419894e405f2 (patch)
treeb191f1925aad82cff3b954ee778aabf974d84403 /res/layout
parent56bbfb648af37902139f26eb7647fd294cd01862 (diff)
downloadandroid_packages_apps_Snap-cfdc874eb6e23e101bd32d10183e419894e405f2.tar.gz
android_packages_apps_Snap-cfdc874eb6e23e101bd32d10183e419894e405f2.tar.bz2
android_packages_apps_Snap-cfdc874eb6e23e101bd32d10183e419894e405f2.zip
SnapdragonCamera:DeepPortrait
Add deepportrait feature in SnapdragonCamera. Change-Id: I5fd223cacfb2526efffbf3f13f7c33cafd8ac99d
Diffstat (limited to 'res/layout')
-rwxr-xr-xres/layout/capture_module.xml9
-rw-r--r--res/layout/one_ui_layout.xml17
2 files changed, 25 insertions, 1 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index b3ade9f55..a9c8f88e5 100755
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -32,6 +32,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:id="@+id/mdp_preivew_frame"
android:layout_gravity="center_vertical|center_horizontal">
<com.android.camera.ui.AutoFitSurfaceView
android:id="@+id/mdp_preview_content"
@@ -41,10 +42,16 @@
<com.android.camera.ui.AutoFitSurfaceView
android:layout_width="300dp"
android:layout_height="300dp"
- android:id="@+id/mdp_preview_content_mono"
+ android:id="@+id/mdp_preview_content_mono"
android:visibility="gone"/>
</FrameLayout>
+ <FrameLayout
+ android:id="@+id/camera_glpreview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical|center_horizontal" />
+
<View
android:id="@+id/preview_cover"
android:layout_width="match_parent"
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index 59e31b95d..61c55cd3a 100644
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -132,6 +132,10 @@
android:id="@+id/ts_makeup_switcher"
style="@style/OneUIMenuButton" />
+ <com.android.camera.ui.RotateImageView
+ android:id="@+id/deepportrait_switcher"
+ style="@style/OneUIMenuButton" />
+
<LinearLayout
android:id="@+id/remaining_photos"
android:layout_width="wrap_content"
@@ -164,6 +168,19 @@
android:layout_width="20dp"
android:src="@drawable/icon_x" />
+
+ <SeekBar
+ android:layout_width="320dp"
+ android:layout_height="40dp"
+ android:maxHeight="3dip"
+ android:minHeight="1dip"
+ android:visibility="gone"
+ android:layout_gravity="center_horizontal|bottom"
+ android:layout_marginBottom="90dp"
+ android:progressDrawable="@drawable/beautify_progressbar_style"
+ android:thumb="@drawable/ic_beautify_oval"
+ android:id="@+id/deepportrait_seekbar"/>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"