diff options
Diffstat (limited to 'res/layout')
-rwxr-xr-x[-rw-r--r--] | res/layout/camera_controls.xml | 4 | ||||
-rwxr-xr-x | res/layout/photo_module.xml | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 59f395b19..5e337096d 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 77c4def21..b1f12dcc7 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> |