[FragmentTransition] Fix for #41354

Mangopony · May 27, 2016 · 6aad4fa · 6aad4fa
1 parent bd4fe3a
commit 6aad4fa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 74 deletions.
diff --git a/FragmentTransition/FragmentTransition/Resources/layout/fragment_detail.xml b/FragmentTransition/FragmentTransition/Resources/layout/fragment_detail.xml
@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2014 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<FrameLayout
-    android:id="@+id/container"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_fragment"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent" />
diff --git a/FragmentTransition/FragmentTransition/Resources/layout/fragment_detail_content.xml b/FragmentTransition/FragmentTransition/Resources/layout/fragment_detail_content.xml
@@ -1,39 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<ScrollView
-    android:id="@+id/frame"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/frame_detail"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="none">
-
     <RelativeLayout
-        android:id="@+id/container"
+        android:id="@+id/container_detail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
         <ImageView
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="180dp"
             android:scaleType="centerCrop"
-            tools:src="@drawable/p1"/>
-
+            tools:src="@drawable/p1" />
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
@@ -48,8 +29,7 @@ limitations under the License.
             android:textColor="#ffffff"
             android:textSize="24sp"
             android:textStyle="bold"
-            tools:text="Image"/>
-
+            tools:text="Image" />
         <TextView
             android:id="@+id/body"
             android:layout_width="match_parent"
@@ -59,8 +39,6 @@ limitations under the License.
             android:layout_marginEnd="16dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:text="@string/lorem_ipsum"/>
-
+            android:text="@string/lorem_ipsum" />
     </RelativeLayout>
-
 </ScrollView>
diff --git a/FragmentTransition/FragmentTransition/Resources/layout/item_meat_grid.xml b/FragmentTransition/FragmentTransition/Resources/layout/item_meat_grid.xml
@@ -1,39 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2014 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<FrameLayout
-    android:id="@+id/frame"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/frame_meat"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
     <RelativeLayout
-        android:id="@+id/container"
+        android:id="@+id/container_meat"
         android:layout_width="match_parent"
         android:layout_height="150dp"
         tools:ignore="UselessParent">
-
         <ImageView
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            tools:src="@drawable/p1"/>
-
+            tools:src="@drawable/p1" />
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
@@ -51,8 +32,6 @@
             android:textColor="#ffffff"
             android:textSize="24sp"
             android:textStyle="bold"
-            tools:text="Hello"/>
-
+            tools:text="Hello" />
     </RelativeLayout>
-
-</FrameLayout>
+</FrameLayout>