3 files changed, 10 insertions, 11 deletions
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index ea1b56407..c0eedab43 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -23,12 +23,6 @@
     android:background="@null">
 
     <include layout="@layout/camera" />
-
-    <com.android.camera.widget.PeekView
-        android:id="@+id/peek_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible" />
     <include layout="@layout/camera_filmstrip" />
     <com.android.camera.ui.ModeTransitionView
         android:id="@+id/mode_transition_view"
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 650ad8fe8..121dc0fbc 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -67,7 +67,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <include layout="@layout/mode_options_bottombar" />
+    <include layout="@layout/sticky_bottom_capture_layout" />
 
     <FrameLayout
         android:id="@+id/tutorials_placeholder_wrapper"
diff --git a/res/layout/mode_options_bottombar.xml b/res/layout/sticky_bottom_capture_layout.xml
index 97ce8fa7a..6d98c30f3 100644
--- a/res/layout/mode_options_bottombar.xml
+++ b/res/layout/sticky_bottom_capture_layout.xml
@@ -15,12 +15,18 @@
 -->
 <!-- This layout is shared by phone and tablet in landscape orientation. -->
 
-<com.android.camera.ui.BottomBarModeOptionsWrapper
+<com.android.camera.ui.StickyBottomCaptureLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/indicator_bottombar_wrapper"
+    android:id="@+id/sticky_bottom_capture_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
+    <com.android.camera.widget.RoundedThumbnailView
+        android:id="@+id/rounded_thumbnail_view"
+        android:layout_width="@+dimen/rounded_thumbnail_ripple_ring_diameter_max"
+        android:layout_height="@+dimen/rounded_thumbnail_ripple_ring_diameter_max"
+        android:visibility="invisible" />
+
     <include layout="@layout/mode_options_overlay" />
 
     <com.android.camera.ui.BottomBar
@@ -33,5 +39,4 @@
         <include layout="@layout/bottom_bar_contents" />
 
     </com.android.camera.ui.BottomBar>
-</com.android.camera.ui.BottomBarModeOptionsWrapper>
-
+</com.android.camera.ui.StickyBottomCaptureLayout>