diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-14 20:47:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 20:47:39 +0000 |
| commit | ce75de57dca5398b7786ad7262cb016e5f6b24ee (patch) | |
| tree | c8e4957ffd18270611311b10c8bc66d1205d9312 /res | |
| parent | b27668f0d0a1d5049759a8448e1701e199e05c71 (diff) | |
| parent | 352b014552d77948193d84ec177c7673552eb1ee (diff) | |
| download | android_packages_apps_Snap-ce75de57dca5398b7786ad7262cb016e5f6b24ee.tar.gz android_packages_apps_Snap-ce75de57dca5398b7786ad7262cb016e5f6b24ee.tar.bz2 android_packages_apps_Snap-ce75de57dca5398b7786ad7262cb016e5f6b24ee.zip | |
Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
| -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> |