Theming: merged edit buttons into layout.

src/main/res/layout/marker_edit.xml

@@ -78,19 +78,17 @@ limitations under the License.
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
-                    android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
                     android:layout_alignParentBottom="true"
-                    android:scaleType="fitStart"
                     android:adjustViewBounds="true"
-                    android:contentDescription="@string/image_photo_marker" />
+                    android:contentDescription="@string/image_photo_marker"
+                    android:scaleType="fitStart" />
 
                 <ImageView
                     android:id="@+id/marker_edit_waypoint_photo_delete"
                     android:layout_width="32dp"
                     android:layout_height="32dp"
-                    android:background="@drawable/shape_circle_darkgray"
-                    android:padding="4dp"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentEnd="true"
                     android:layout_margin="16dp"
@@ -98,6 +96,8 @@ limitations under the License.
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
                     android:layout_marginBottom="8dp"
+                    android:background="@drawable/shape_circle_darkgray"
+                    android:padding="4dp"
                     android:src="@drawable/ic_delete_forever_24dp" />
             </RelativeLayout>
         </LinearLayout>
@@ -107,6 +107,15 @@ limitations under the License.
 
     <LinearLayout style="@style/BottomButtonBar">
 
-        <include layout="@layout/marker_edit_buttons" />
+        <Button
+            android:id="@+id/marker_edit_cancel"
+            style="@style/BottomButton"
+            android:layout_gravity="left"
+            android:text="@string/generic_cancel" />
+
+        <Button
+            android:id="@+id/marker_edit_done"
+            style="@style/BottomButton"
+            android:layout_gravity="right" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/marker_edit_buttons.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- In v14, postive button on the right. -->
-    <Button
-        android:id="@+id/marker_edit_cancel"
-        style="@style/BottomButton"
-        android:layout_gravity="left"
-        android:text="@string/generic_cancel" />
-
-    <Button
-        android:id="@+id/marker_edit_done"
-        style="@style/BottomButton"
-        android:layout_gravity="right" />
-</merge>

src/main/res/layout/track_edit.xml

@@ -80,6 +80,16 @@ limitations under the License.
 
     <LinearLayout style="@style/BottomButtonBar">
 
-        <include layout="@layout/track_edit_buttons" />
+        <Button
+            android:id="@+id/track_edit_cancel"
+            style="@style/BottomButton"
+            android:layout_gravity="left"
+            android:text="@string/generic_cancel" />
+
+        <Button
+            android:id="@+id/track_edit_save"
+            style="@style/BottomButton"
+            android:layout_gravity="right"
+            android:text="@string/generic_save" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/track_edit_buttons.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- In v14, postive button on the right. -->
-    <Button
-        android:id="@+id/track_edit_cancel"
-        style="@style/BottomButton"
-        android:layout_gravity="left"
-        android:text="@string/generic_cancel" />
-
-    <Button
-        android:id="@+id/track_edit_save"
-        style="@style/BottomButton"
-        android:layout_gravity="right"
-        android:text="@string/generic_save" />
-</merge>