diff options
author | Weijie Wang <weijiew@codeaurora.org> | 2017-09-05 10:42:58 +0800 |
---|---|---|
committer | Weijie Wang <weijiew@codeaurora.org> | 2017-09-05 11:02:23 +0800 |
commit | b59cf61c82d6c4af43a9f76a101b29f2a8b5ac17 (patch) | |
tree | 02dde6e1d3d923baf4feb2074f8e49c1f4141207 /res/layout | |
parent | 454d5b45b6b08e9213dc590fa0ebd084b50408fe (diff) | |
download | android_packages_apps_Snap-b59cf61c82d6c4af43a9f76a101b29f2a8b5ac17.tar.gz android_packages_apps_Snap-b59cf61c82d6c4af43a9f76a101b29f2a8b5ac17.tar.bz2 android_packages_apps_Snap-b59cf61c82d6c4af43a9f76a101b29f2a8b5ac17.zip |
SnapdragonCamera: Refactor
1. Add some logs
2. Change the layout of beautify seekbar
3. Add attribute android:visibleToInstantApps="true" for CTS
4. keep capturing until AeState becomes right on chrommaflash mode
Change-Id: I295d5d6f42250254d613123a7d58f7f7fb0e7f3d
Diffstat (limited to 'res/layout')
-rw-r--r--[-rwxr-xr-x] | res/layout/one_ui_layout.xml | 99 |
1 files changed, 50 insertions, 49 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index 5904b5b96..59e31b95d 100755..100644 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -133,15 +133,48 @@ style="@style/OneUIMenuButton" /> <LinearLayout + android:id="@+id/remaining_photos" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:orientation="horizontal" + android:visibility="gone"> + + <TextView + android:id="@+id/remaining_photos_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:textColor="@android:color/white" + android:visibility="gone" /> + + <ImageView + android:id="@+id/remaining_photos_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/remaining_sheets" + android:visibility="gone" /> + </LinearLayout> + + <include layout="@layout/pro_mode_layout" /> + + <ImageView + android:id="@+id/promode_close_button" + android:layout_height="20dp" + android:layout_width="20dp" + android:src="@drawable/icon_x" /> + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/makeup_seekbar_layout" android:visibility="gone"> <ImageView - android:layout_width="12dp" - android:layout_height="20dp" - android:layout_marginLeft="23dp" - android:layout_marginRight="23dp" + android:layout_width="30dp" + android:layout_height="40dp" + android:layout_marginLeft="20dp" + android:layout_marginRight="10dp" + android:src="@drawable/seekbar_hide" android:id="@+id/seekbar_toggle"> </ImageView> <RelativeLayout @@ -149,8 +182,8 @@ android:layout_height="wrap_content" android:id="@+id/seekbar_body"> <com.android.camera.ui.RotateLayout - android:layout_width="24dp" - android:layout_height="24dp" + android:layout_width="30dp" + android:layout_height="40dp" android:layout_alignParentLeft="true" android:id="@+id/makeup_low_text"> <TextView @@ -163,18 +196,18 @@ </TextView> </com.android.camera.ui.RotateLayout> <SeekBar - android:layout_width="220dp" - android:layout_height="wrap_content" - android:maxHeight="3dip" - android:minHeight="1dip" - android:layout_marginLeft="10dp" - android:layout_toRightOf="@+id/makeup_low_text" - android:progressDrawable="@drawable/beautify_progressbar_style" - android:thumb="@drawable/ic_beautify_oval" - android:id="@+id/makeup_seekbar"/> + android:layout_width="220dp" + android:layout_height="40dp" + android:maxHeight="3dip" + android:minHeight="1dip" + android:layout_marginLeft="10dp" + android:layout_toRightOf="@+id/makeup_low_text" + android:progressDrawable="@drawable/beautify_progressbar_style" + android:thumb="@drawable/ic_beautify_oval" + android:id="@+id/makeup_seekbar"/> <com.android.camera.ui.RotateLayout - android:layout_width="24dp" - android:layout_height="24dp" + android:layout_width="30dp" + android:layout_height="40dp" android:layout_toRightOf="@+id/makeup_seekbar" android:layout_marginLeft="10dp" android:id="@+id/makeup_high_text"> @@ -189,36 +222,4 @@ </com.android.camera.ui.RotateLayout> </RelativeLayout> </LinearLayout> - - <LinearLayout - android:id="@+id/remaining_photos" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@android:color/transparent" - android:orientation="horizontal" - android:visibility="gone"> - - <TextView - android:id="@+id/remaining_photos_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@android:color/transparent" - android:textColor="@android:color/white" - android:visibility="gone" /> - - <ImageView - android:id="@+id/remaining_photos_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/remaining_sheets" - android:visibility="gone" /> - </LinearLayout> - - <include layout="@layout/pro_mode_layout" /> - - <ImageView - android:id="@+id/promode_close_button" - android:layout_height="20dp" - android:layout_width="20dp" - android:src="@drawable/icon_x" /> </com.android.camera.ui.OneUICameraControls> |