diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-04 12:50:34 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | e3d36c451e9e66c7786c169248c3a8aa06b67de7 (patch) | |
| tree | 1d1fdc563297db51c912203c40ec29a731ae14bc /res/layout/camera.xml | |
| parent | 9fc9fd41865ae855b5d8bb925b8100a16aa63c3b (diff) | |
| download | android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.gz android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.bz2 android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.zip | |
camera2: Fix merge issues
Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
Diffstat (limited to 'res/layout/camera.xml')
| -rw-r--r-- | res/layout/camera.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index a71460066..7ca37e43b 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.CameraRootFrame xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_root_frame" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -37,4 +37,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" > </com.android.camera.ui.CameraRootView> -</FrameLayout> +</com.android.camera.ui.CameraRootFrame> |