From bf8aede7f7dfe71379d117ed11e9821326307f10 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Wed, 23 Mar 2016 21:51:07 +0100
Subject: [PATCH] Lint

---
 app/src/main/res/layout/activity_main_editor_with_toolbar.xml | 4 +++-
 app/src/main/res/layout/fragment_plot_function_edit.xml       | 4 ++--
 app/src/main/res/values/text_strings.xml                      | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/activity_main_editor_with_toolbar.xml b/app/src/main/res/layout/activity_main_editor_with_toolbar.xml
index e1fc6c63..1b5a959b 100644
--- a/app/src/main/res/layout/activity_main_editor_with_toolbar.xml
+++ b/app/src/main/res/layout/activity_main_editor_with_toolbar.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     a:layout_width="match_parent"
     a:layout_height="0dp"
-    a:layout_weight="2">
+    a:layout_weight="2"
+    tools:ignore="MergeRootFrame">
 
     <FrameLayout
         a:id="@+id/editor"
diff --git a/app/src/main/res/layout/fragment_plot_function_edit.xml b/app/src/main/res/layout/fragment_plot_function_edit.xml
index 07154351..cebfc31a 100644
--- a/app/src/main/res/layout/fragment_plot_function_edit.xml
+++ b/app/src/main/res/layout/fragment_plot_function_edit.xml
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:paddingStart="4dp"
                     android:paddingLeft="4dp"
-                    android:text="@string/fn_line_width"
+                    android:text="@string/cpp_plot_function_line_width"
                     tools:ignore="RtlSymmetry"/>
 
                 <SeekBar
@@ -79,7 +79,7 @@
                     android:layout_height="wrap_content"
                     android:paddingStart="4dp"
                     android:paddingLeft="4dp"
-                    android:text="@string/fn_line_color"
+                    android:text="@string/cpp_plot_function_line_color"
                     tools:ignore="RtlSymmetry"/>
 
                 <uz.shift.colorpicker.LineColorPicker
diff --git a/app/src/main/res/values/text_strings.xml b/app/src/main/res/values/text_strings.xml
index a2de0bf2..8be80379 100644
--- a/app/src/main/res/values/text_strings.xml
+++ b/app/src/main/res/values/text_strings.xml
@@ -147,8 +147,6 @@
     <string name="cpp_system_language">System language</string>
     <string name="cpp_missing_permission_title">Missing permission</string>
     <string name="cpp_missing_permission_msg">Please enable \"%1$s\" permission in system settings</string>
-    <string name="fn_line_width">Line width</string>
-    <string name="fn_line_color">Line color</string>
     <string name="cpp_mode">Mode</string>
     <string name="cpp_mode_status">Mode: %1$s</string>
     <string name="cpp_units_from" comment="Hint to be used in 'From' input field in unit converter window">From</string>