Merge "SnapdragonCamera: fix portrait orientation"

11 files changed, 55 insertions, 488 deletions

diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
deleted file mode 100644
index f10ae9271..000000000
--- a/res/layout-land/camera_controls.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/camera_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <View
-        android:id="@+id/blocker"
-        android:layout_width="@dimen/switcher_size"
-        android:layout_height="match_parent"
-        android:layout_gravity="right"
-        android:clickable="true" />
-
-    <include
-        android:layout_width="64dip"
-        android:layout_height="64dip"
-        android:layout_gravity="top|right"
-        android:layout_marginRight="8dip"
-        android:layout_marginTop="-8dip"
-        layout="@layout/menu_indicators" />
-
-    <com.android.camera.ui.RotatableLayout
-        android:id="@+id/menu"
-        style="@style/ToggleButtonOuter"
-        android:layout_marginRight="2dip" >
-
-        <ImageView
-            style="@style/MenuButton"
-            android:layout_gravity="center"
-            android:contentDescription="@string/accessibility_menu_button"
-            android:src="@drawable/ic_settings" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ui.ModuleSwitcher
-        android:id="@+id/camera_switcher"
-        style="@style/SwitcherButton"
-        android:layout_gravity="right|bottom"
-        android:layout_marginRight="2dip"
-        android:contentDescription="@string/accessibility_mode_picker" />
-
-    <com.android.camera.ShutterButton
-        android:id="@+id/shutter_button"
-        android:layout_width="@dimen/shutter_size"
-        android:layout_height="@dimen/shutter_size"
-        android:layout_gravity="right|center_vertical"
-        android:layout_marginRight="@dimen/shutter_offset"
-        android:clickable="true"
-        android:contentDescription="@string/accessibility_shutter_button"
-        android:focusable="true"
-        android:scaleType="fitCenter"
-        android:src="@drawable/btn_new_shutter" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/preview_thumb"
-        android:layout_width="@dimen/capture_size"
-        android:layout_height="@dimen/capture_size"
-        android:layout_gravity="top|right"
-        android:background="@android:color/black"
-        android:contentDescription="@string/switch_photo_filmstrip"
-        android:scaleType="fitCenter" />
-
-    <com.android.camera.ui.RotatableLayout
-        android:id="@+id/front_back_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ui.RotatableLayout
-        android:id="@+id/hdr_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ui.RotatableLayout
-        android:id="@+id/scene_mode_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ui.RotatableLayout
-        android:id="@+id/filter_mode_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <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" />
-
-        <ImageView
-            android:id="@+id/remaining_photos_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/remaining_sheets" />
-    </LinearLayout>
-
-</com.android.camera.ui.CameraControls>
\ No newline at end of file
diff --git a/res/layout-land/pano_preview_progress.xml b/res/layout-land/pano_preview_progress.xml
deleted file mode 100644
index c6c131741..000000000
--- a/res/layout-land/pano_preview_progress.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/panorama_capture_layout"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <!-- The top bar with capture indication -->
-        <FrameLayout
-            style="@style/PanoViewHorizontalBar"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <TextView
-                android:id="@+id/pano_capture_indicator"
-                android:text="@string/pano_capture_indication"
-                android:textAppearance="?android:textAppearanceMedium"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_gravity="center"
-            android:id="@+id/pano_preview_layout"
-            android:layout_weight="@integer/SRI_pano_layout_weight"
-            android:layout_width="match_parent"
-            android:layout_height="0dp">
-
-            <TextureView
-                android:id="@+id/pano_preview_textureview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/pano_preview_area_border"
-                android:visibility="gone"
-                android:background="@drawable/ic_pan_border_fast"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </FrameLayout>
-
-        <!-- The bottom bar with progress bar and direction indicators -->
-        <FrameLayout
-            style="@style/PanoViewHorizontalBar"
-            android:paddingTop="20dp"
-            android:gravity="top"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.android.camera.PanoProgressBar
-                    android:id="@+id/pano_pan_progress_bar"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_pan_progression"
-                    android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/pano_pan_left_indicator"
-                    android:src="@drawable/pano_direction_left_indicator"
-                    android:visibility="gone"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/pano_pan_right_indicator"
-                    android:src="@drawable/pano_direction_right_indicator"
-                    android:visibility="gone"
-                    android:layout_marginLeft="5dp"
-                    android:layout_toRightOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </RelativeLayout>
-        </FrameLayout>
-
-
-    </LinearLayout>
-
-    <!-- The hint for "Too fast" text view -->
-    <TextView
-        android:id="@+id/pano_capture_too_fast_textview"
-        android:text="@string/pano_too_fast_prompt"
-        android:textAppearance="?android:textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-</FrameLayout>
diff --git a/res/layout-land/pano_review_control.xml b/res/layout-land/pano_review_control.xml
deleted file mode 100644
index 93c1020a8..000000000
--- a/res/layout-land/pano_review_control.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <com.android.camera.PanoProgressBar
-        android:id="@+id/pano_saving_progress_bar"
-        android:src="@drawable/ic_pan_progression"
-        android:layout_gravity="center"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/pano_review_cancel_button"
-        android:scaleType="center"
-        style="@style/ReviewControlIcon"
-        android:contentDescription="@string/accessibility_review_cancel"
-        android:layout_gravity="center_vertical|right"
-        android:src="@drawable/ic_menu_cancel_holo_light" />
-</merge>
\ No newline at end of file
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index ee24cfef2..121f25b6e 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -33,17 +33,11 @@
         android:layout_marginRight="-8dip"
         layout="@layout/menu_indicators" />
 
-    <com.android.camera.ui.RotatableLayout
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/menu"
-        style="@style/MenuButtonOuter"
-        android:layout_marginRight="2dip" >
-
-        <ImageView
-            style="@style/MenuButton"
-            android:layout_gravity="center"
-            android:contentDescription="@string/accessibility_menu_button"
-            android:src="@drawable/ic_settings" />
-    </com.android.camera.ui.RotatableLayout>
+        style="@style/MenuButton"
+        android:contentDescription="@string/accessibility_menu_button"
+        android:src="@drawable/ic_settings" />
 
     <com.android.camera.ui.ModuleSwitcher
         android:id="@+id/camera_switcher"
@@ -73,41 +67,21 @@
         android:contentDescription="@string/switch_photo_filmstrip"
         android:scaleType="fitCenter" />
 
-    <com.android.camera.ui.RotatableLayout
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/front_back_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
+        style="@style/ToggleButton" />
 
-    <com.android.camera.ui.RotatableLayout
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/hdr_switcher"
-        style="@style/ToggleButtonOuter" >
+        style="@style/ToggleButton" />
 
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
-
-    <com.android.camera.ui.RotatableLayout
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/scene_mode_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
+        style="@style/ToggleButton" />
 
-    <com.android.camera.ui.RotatableLayout
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/filter_mode_switcher"
-        style="@style/ToggleButtonOuter" >
-
-        <com.android.camera.ui.RotateImageView
-            style="@style/ToggleButton"
-            android:layout_gravity="center" />
-    </com.android.camera.ui.RotatableLayout>
+        style="@style/ToggleButton" />
 
     <LinearLayout
         android:id="@+id/remaining_photos"
@@ -122,13 +96,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:textColor="@android:color/white" />
+            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:src="@drawable/remaining_sheets"
+            android:visibility="gone" />
     </LinearLayout>
 
-</com.android.camera.ui.CameraControls>
\ No newline at end of file
+</com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/pano_preview_progress.xml b/res/layout-port/pano_preview_progress.xml
deleted file mode 100644
index c6c131741..000000000
--- a/res/layout-port/pano_preview_progress.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/panorama_capture_layout"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <!-- The top bar with capture indication -->
-        <FrameLayout
-            style="@style/PanoViewHorizontalBar"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <TextView
-                android:id="@+id/pano_capture_indicator"
-                android:text="@string/pano_capture_indication"
-                android:textAppearance="?android:textAppearanceMedium"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_gravity="center"
-            android:id="@+id/pano_preview_layout"
-            android:layout_weight="@integer/SRI_pano_layout_weight"
-            android:layout_width="match_parent"
-            android:layout_height="0dp">
-
-            <TextureView
-                android:id="@+id/pano_preview_textureview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/pano_preview_area_border"
-                android:visibility="gone"
-                android:background="@drawable/ic_pan_border_fast"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </FrameLayout>
-
-        <!-- The bottom bar with progress bar and direction indicators -->
-        <FrameLayout
-            style="@style/PanoViewHorizontalBar"
-            android:paddingTop="20dp"
-            android:gravity="top"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.android.camera.PanoProgressBar
-                    android:id="@+id/pano_pan_progress_bar"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_pan_progression"
-                    android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/pano_pan_left_indicator"
-                    android:src="@drawable/pano_direction_left_indicator"
-                    android:visibility="gone"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/pano_pan_right_indicator"
-                    android:src="@drawable/pano_direction_right_indicator"
-                    android:visibility="gone"
-                    android:layout_marginLeft="5dp"
-                    android:layout_toRightOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </RelativeLayout>
-        </FrameLayout>
-
-
-    </LinearLayout>
-
-    <!-- The hint for "Too fast" text view -->
-    <TextView
-        android:id="@+id/pano_capture_too_fast_textview"
-        android:text="@string/pano_too_fast_prompt"
-        android:textAppearance="?android:textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-</FrameLayout>
diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml
index dfa036c1f..558d7ce77 100644
--- a/res/layout/filter_mode_view.xml
+++ b/res/layout/filter_mode_view.xml
@@ -26,32 +26,36 @@
      OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/filter_mode_width"
-    android:layout_height="@dimen/filter_mode_height"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    android:padding="@dimen/filter_mode_padding" >
+<com.android.camera.ui.RotateLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/filter_mode_padding">
 
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_gravity="center"
-        android:padding="2dp" />
+    <LinearLayout
+        android:layout_width="@dimen/filter_mode_width"
+        android:layout_height="@dimen/filter_mode_height"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:shadowColor="@android:color/black"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="2"
-        android:singleLine="true"
-        android:textColor="@android:color/white"
-        android:textSize="13sp"
-        android:textStyle="bold" />
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center"
+            android:padding="2dp" />
 
-</LinearLayout>
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:shadowColor="@android:color/black"
+            android:shadowDx="1"
+            android:shadowDy="1"
+            android:shadowRadius="2"
+            android:singleLine="true"
+            android:textColor="@android:color/white"
+            android:textSize="13sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+</com.android.camera.ui.RotateLayout>
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
index c6c131741..6ab8c9e4b 100644
--- a/res/layout/pano_module_capture.xml
+++ b/res/layout/pano_module_capture.xml
@@ -63,6 +63,7 @@
 
         <!-- The bottom bar with progress bar and direction indicators -->
         <FrameLayout
+            android:id="@+id/pano_progress_layout"
             style="@style/PanoViewHorizontalBar"
             android:paddingTop="20dp"
             android:gravity="top"
diff --git a/res/layout/pano_module_review.xml b/res/layout/pano_module_review.xml
index 3f80e8af0..6aeaa753c 100644
--- a/res/layout/pano_module_review.xml
+++ b/res/layout/pano_module_review.xml
@@ -22,6 +22,7 @@
     android:layout_width="match_parent">
 
     <TextView
+        android:id="@+id/pano_review_indicator"
         style="@style/PanoViewHorizontalBar"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml
index e8a9499d6..d4c2a259c 100644
--- a/res/layout/scene_mode_view.xml
+++ b/res/layout/scene_mode_view.xml
@@ -26,7 +26,7 @@
      OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="center"
@@ -64,4 +64,4 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-</LinearLayout>
+</com.android.camera.ui.RotateLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 327b30bbd..64e55adc7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -163,7 +163,7 @@
     <dimen name="scene_mode_width">90dp</dimen>
     <dimen name="scene_mode_padding">10dp</dimen>
     <dimen name="filter_mode_height">100dp</dimen>
-    <dimen name="filter_mode_width">80dp</dimen>
+    <dimen name="filter_mode_width">100dp</dimen>
     <dimen name="filter_mode_padding">10dp</dimen>
 
     <dimen name="remaining_photos_margin">67dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 682337fe9..bd971d5a2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -248,22 +248,14 @@
         <item name="android:background">@drawable/bg_pressed_exit_fading</item>
     </style>
     <style name="MenuButton">
-        <item name="android:layout_width">@dimen/menu_size</item>
-        <item name="android:layout_height">@dimen/menu_size</item>
-    </style>
-    <style name="MenuButtonOuter">
         <item name="android:layout_width">@dimen/menu_outer_size</item>
         <item name="android:layout_height">@dimen/menu_outer_size</item>
-        <item name="android:background">@drawable/bg_pressed_exit_fading</item>
+        <item name="android:scaleType">center</item>
     </style>
     <style name="ToggleButton">
-        <item name="android:layout_width">@dimen/toggle_size</item>
-        <item name="android:layout_height">@dimen/toggle_size</item>
-    </style>
-    <style name="ToggleButtonOuter">
         <item name="android:layout_width">@dimen/toggle_outer_size</item>
         <item name="android:layout_height">@dimen/toggle_outer_size</item>
-        <item name="android:background">@drawable/bg_pressed_exit_fading</item>
+        <item name="android:scaleType">center</item>
     </style>
     <style name="MenuIndicator">
         <item name="android:layout_width">wrap_content</item>
@@ -308,7 +300,6 @@
         <item name="android:background">@drawable/bg_pressed</item>
     </style>
     <style name="PanoViewHorizontalBar">
-        <item name="android:background">#000000</item>
-        <item name="android:alpha">1.0</item>
+        <item name="android:background">@android:color/transparent</item>
     </style>
 </resources>