diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/capture_module.xml | 9 | ||||
| -rw-r--r-- | res/layout/photo_module.xml | 12 | ||||
| -rw-r--r-- | res/layout/video_module.xml | 12 |
3 files changed, 18 insertions, 15 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index b03c43317..dba8de9a8 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -64,7 +64,14 @@ android:id="@+id/focus_ring" android:layout_width="match_parent" android:layout_height="match_parent" /> - </FrameLayout> + + <com.android.camera.ui.CaptureAnimationOverlay + android:id="@+id/capture_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + </FrameLayout> <com.android.camera.ui.RenderOverlay android:id="@+id/render_overlay" diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index f184e0c56..794a968f4 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -45,6 +45,11 @@ android:id="@+id/focus_ring" android:layout_width="match_parent" android:layout_height="match_parent" /> + <com.android.camera.ui.CaptureAnimationOverlay + android:id="@+id/capture_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <com.android.camera.ui.RotateImageView android:id="@+id/review_image" android:layout_width="match_parent" @@ -53,13 +58,6 @@ android:clickable="true" android:background="@android:color/black" android:scaleType="fitCenter"/> - <View - android:id="@+id/flash_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white" - android:visibility="gone" - android:alpha="0" /> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index c6a9d7e80..f12f06ce7 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -43,13 +43,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" /> - <View - android:id="@+id/flash_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white" - android:visibility="gone" - android:alpha="0" /> <FrameLayout android:id="@+id/preview_border" android:layout_width="match_parent" android:layout_height="match_parent" @@ -81,6 +74,11 @@ android:id="@+id/focus_ring" android:layout_width="match_parent" android:layout_height="match_parent" /> + <com.android.camera.ui.CaptureAnimationOverlay + android:id="@+id/capture_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> <ImageView android:id="@+id/review_image" android:layout_height="match_parent" android:layout_width="match_parent" |