summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2017-06-29 13:44:15 +0800
committerjunjiez <junjiez@codeaurora.org>2017-07-26 15:28:52 +0800
commitef407574ede2694755abbd5a872936623030c1d7 (patch)
treed89371f4fdc74d928f032bc6bba3d921a0bad01d /res/layout
parent73c61caa5c7d17f02153bd559e5dbe340dbff245 (diff)
downloadandroid_packages_apps_Snap-ef407574ede2694755abbd5a872936623030c1d7.zip
android_packages_apps_Snap-ef407574ede2694755abbd5a872936623030c1d7.tar.gz
android_packages_apps_Snap-ef407574ede2694755abbd5a872936623030c1d7.tar.bz2
SnapdragonCamera:RTB UI
1.add a new icon on the top of camera control to enable bokeh mode. 2.add toast to show the distance,lighting and effect alert. 3.add debug mode to save all the images received from HAL separately 4.modify ui according to the spec Change-Id: I1178015f48c29cade4e14bb531c9727665905fec
Diffstat (limited to 'res/layout')
-rwxr-xr-x[-rw-r--r--]res/layout/camera_controls.xml4
-rwxr-xr-xres/layout/photo_module.xml16
2 files changed, 15 insertions, 5 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 59f395b..5e33709 100644..100755
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -112,6 +112,10 @@
android:id="@+id/ts_makeup_switcher"
style="@style/ToggleButton" />
+ <com.android.camera.ui.RotateImageView
+ android:id="@+id/bokeh_switcher"
+ style="@style/ToggleButton" />
+
<LinearLayout
android:id="@+id/remaining_photos"
android:layout_width="wrap_content"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 77c4def..b1f12dc 100755
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -116,12 +116,18 @@
style="?android:attr/seekBarStyle"
android:id="@+id/blur_degree_bar"
android:orientation="horizontal"
- android:layout_gravity="bottom"
- android:layout_width="match_parent"
+ android:layout_width="200dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="160dip"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:visibility="gone"/>
+ <TextView
+ android:id="@+id/bokeh_tip_text"
+ android:background="@android:color/darker_gray"
+ android:textColor="@android:color/white"
+ android:textSize="20sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="130dip"
+ android:layout_gravity="bottom|center_horizontal"
android:visibility="gone"/>
</FrameLayout>
</merge>