diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-14 12:06:20 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-10-14 12:06:20 -0700 |
| commit | 352b014552d77948193d84ec177c7673552eb1ee (patch) | |
| tree | fd6023c568c1ae31cb2047a334b4094065c99291 /res/layout | |
| parent | ae1697302b4ef59bbfebdf1127bc73531ce550b7 (diff) | |
| download | android_packages_apps_Snap-352b014552d77948193d84ec177c7673552eb1ee.tar.gz android_packages_apps_Snap-352b014552d77948193d84ec177c7673552eb1ee.tar.bz2 android_packages_apps_Snap-352b014552d77948193d84ec177c7673552eb1ee.zip | |
Fix SRI upside down preview in reverse landscape and reverse portrait
Also make sure preview is not upside down after device flip, and
fix camera controls jiggering during rotation
Bug: 11216647
Bug: 11174540
Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/panorama_module.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml index 3711cc67f..0b2785a3e 100644 --- a/res/layout/panorama_module.xml +++ b/res/layout/panorama_module.xml @@ -14,8 +14,7 @@ limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pano_layout" +<merge xmlns:android="http://schemas.android.com/apk/res/android" android:clickable="true" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -24,4 +23,4 @@ <include layout="@layout/camera_controls" android:layout_gravity="center" style="@style/CameraControls"/> -</FrameLayout> +</merge> |