keep three dots option toggle on the screen

bug: 13716654
Change-Id: I142d2ce8c026ad4f4fded15475e4d2a42e10f859

2 files changed, 46 insertions, 16 deletions

diff --git a/res/layout-land/indicators.xml b/res/layout-land/indicators.xml
new file mode 100644
index 000000000..77b49e7c1
--- /dev/null
+++ b/res/layout-land/indicators.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- This layout is shared by phone and tablet in landscape orientation. -->
+  <!-- TODO: make horizontal once nine patch stretches horizontally -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:id="@+id/mode_options_toggle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="@dimen/mode_options_toggle_padding"
+      android:layout_margin="@dimen/mode_options_toggle_padding"
+      android:orientation="horizontal"
+      android:contentDescription="@string/accessibility_mode_options"
+      android:background="@drawable/bg_options_indicator"
+      android:layout_gravity="top|right" >
+    <ImageView
+        android:id="@+id/pano_indicator"
+        style="@style/IndicatorIcon" />
+    <ImageView
+        android:id="@+id/hdr_indicator"
+        style="@style/IndicatorIcon" />
+    <ImageView
+        android:id="@+id/flash_indicator"
+        style="@style/IndicatorIcon" />
+    <ImageView
+        android:id="@+id/three_dots"
+        style="@style/IndicatorIcon"
+        android:src="@drawable/ic_options_land"
+        android:contentDescription="@string/accessibility_mode_options"
+        android:visibility="visible" />
+</LinearLayout>
diff --git a/res/layout-land/mode_options_bottombar.xml b/res/layout-land/mode_options_bottombar.xml
index 6703053ea..5a44faa58 100644
--- a/res/layout-land/mode_options_bottombar.xml
+++ b/res/layout-land/mode_options_bottombar.xml
@@ -76,22 +76,9 @@
                         style="@style/ModeOption" />
                 </com.android.camera.ui.TopRightWeightedLayout>
             </com.android.camera.widget.ModeOptions>
-            <FrameLayout
-                android:id="@+id/mode_options_toggle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:layout_gravity="top|right" >
-                <ImageView
-                    android:id="@+id/three_dots"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:scaleType="matrix"
-                    android:src="@drawable/ic_options_active"
-                    android:contentDescription="@string/accessibility_mode_options"
-                    android:background="@null" />
-                <include layout="@layout/indicators" />
-            </FrameLayout>
+
+            <include layout="@layout/indicators" />
+
         </com.android.camera.widget.ModeOptionsOverlay>
 
         <include layout="@layout/bottom_bar" />