Replace FrameLayout with merge tag.

tvbarthel · Feb 25, 2015 · 3c53ae3 · 3c53ae3
1 parent 693fd4c
commit 3c53ae3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CameraColorPicker/app/src/main/res/layout/activity_color_detail.xml b/CameraColorPicker/app/src/main/res/layout/activity_color_detail.xml
@@ -1,4 +1,4 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -70,4 +70,4 @@
     </LinearLayout>
 
 
-</FrameLayout>
+</merge>
diff --git a/CameraColorPicker/app/src/main/res/layout/activity_main.xml b/CameraColorPicker/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -32,4 +32,4 @@
         app:fab_colorPressed="@color/color_accent"
         app:fab_colorRipple="?attr/colorControlHighlight" />
 
-</FrameLayout>
+</merge>