diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-13 02:32:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-13 02:32:33 -0800 |
| commit | a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8 (patch) | |
| tree | ecd7c1b5d04be0f3cef5a357481fe3b45cc51704 /res/layout/capture_module.xml | |
| parent | 1e8e52e5de1725d47101157b2328cbd76e9d9a83 (diff) | |
| parent | b39e01c54b0d46b8a005e48e88537bc875b4977b (diff) | |
| download | android_packages_apps_Snap-a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8.tar.gz android_packages_apps_Snap-a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8.tar.bz2 android_packages_apps_Snap-a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8.zip | |
Merge "SnapdragonCamera: Show label and dialog when switch to new scene mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res/layout/capture_module.xml')
| -rwxr-xr-x | res/layout/capture_module.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 0063a2e6a..44d5c59c6 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -87,6 +87,9 @@ </FrameLayout> <include + layout="@layout/scene_mode_label"/> + + <include style="@style/CameraControls" layout="@layout/one_ui_layout" android:layout_gravity="center" /> |