Cleanup.

src/main/res/layout/marker_detail_fragment.xml

@@ -17,55 +17,50 @@ limitations under the License.
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+        android:id="@+id/marker_detail_waypoint_photo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        android:contentDescription="@string/image_photo_marker"
+        android:scaleType="fitCenter" />
+
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
+        android:layout_height="wrap_content">
+        <!-- A gradient on top of the text -->
         <ImageView
-            android:id="@+id/marker_detail_waypoint_photo"
+            android:id="@+id/marker_detail_waypoint_text_gradient"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/black"
+            android:alpha=".6"
             android:contentDescription="@string/image_photo_marker"
-            android:scaleType="fitCenter" />
+            android:src="@drawable/text_gradient" />
 
-        <FrameLayout
+        <LinearLayout
+            android:id="@+id/marker_detail_waypoint_info"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <!-- A gradient on top of the text -->
-            <ImageView
-                android:id="@+id/marker_detail_waypoint_text_gradient"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha=".6"
-                android:contentDescription="@string/image_photo_marker"
-                android:src="@drawable/text_gradient" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="80dp"
+            android:orientation="vertical"
+            android:padding="8dp">
 
-            <LinearLayout
-                android:id="@+id/marker_detail_waypoint_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="80dp"
-                android:orientation="vertical"
-                android:padding="8dp">
+            <TextView
+                android:id="@+id/marker_detail_waypoint_name"
+                style="@style/TextMedium"
+                android:paddingTop="8dp" />
 
-                <TextView
-                    android:id="@+id/marker_detail_waypoint_name"
-                    style="@style/TextMedium"
-                    android:paddingTop="8dp" />
+            <TextView
+                android:id="@+id/marker_detail_waypoint_category"
+                style="@style/TextSmall" />
 
-                <TextView
-                    android:id="@+id/marker_detail_waypoint_category"
-                    style="@style/TextSmall" />
+            <TextView
+                android:id="@+id/marker_detail_waypoint_description"
+                style="@style/TextSmall" />
 
-                <TextView
-                    android:id="@+id/marker_detail_waypoint_description"
-                    style="@style/TextSmall" />
-
-                <TextView
-                    android:id="@+id/marker_detail_waypoint_location"
-                    style="@style/TextSmall" />
-            </LinearLayout>
-        </FrameLayout>
+            <TextView
+                android:id="@+id/marker_detail_waypoint_location"
+                style="@style/TextSmall" />
+        </LinearLayout>
     </FrameLayout>
 </FrameLayout>

src/main/res/values/dimens.xml

@@ -1,18 +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.
--->
-<resources>
-    <dimen name="widget_margin">0dp</dimen>
-</resources>

src/main/res/values/settings_deprecated.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- This file contains old and now unused settings. -->
     <!-- It is recommended not to reuse the keys. -->
 
-    <string name="chart_x_axis_key" translatable="false">chartXAxis</string>
-    <string name="chart_x_axis_default" translatable="false">@string/chart_x_axis_distance</string>
-    <string-array name="chart_x_axis_values">
+    <string name="chart_x_axis_key" translatable="false" tools:keep="@string/chart_x_axis_key">chartXAxis</string>
+    <string name="chart_x_axis_default" translatable="false" tools:keep="@string/chart_x_axis_default">@string/chart_x_axis_distance</string>
+    <string-array name="chart_x_axis_values" tools:keep="@array/chart_x_axis_values">
         <item>@string/chart_x_axis_distance</item>
         <item>@string/chart_x_axis_time</item>
     </string-array>
-    <string name="chart_x_axis_time" translatable="false">TIME</string>
-    <string name="chart_x_axis_distance" translatable="false">DISTANCE</string>
-    <string-array name="chart_x_axis_options">
+    <string name="chart_x_axis_time" translatable="false" tools:keep="@string/chart_x_axis_time">TIME</string>
+    <string name="chart_x_axis_distance" translatable="false" tools:keep="@string/chart_x_axis_distance">DISTANCE</string>
+    <string-array name="chart_x_axis_options" tools:keep="@array/chart_x_axis_options">
         <item>@string/settings_chart_by_distance</item>
         <item>@string/settings_chart_by_time</item>
     </string-array>
 
-    <string name="split_frequency_key" translatable="false">splitFrequency</string>
-    <string name="split_frequency_default" translatable="false">@string/frequency_off</string>
+    <string name="split_frequency_key" translatable="false" tools:keep="@string/split_frequency_key">splitFrequency</string>
+    <string name="split_frequency_default" translatable="false" tools:keep="@string/split_frequency_default">@string/frequency_off</string>
     <string name="voice_frequency_key" translatable="false">voiceFrequency</string>
     <string name="voice_frequency_default" translatable="false">@string/frequency_off</string>
     <string name="frequency_off" translatable="false">0</string>