From 9fc1ee214c865dfa9a11986a0d516fe974953e09 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Wed, 18 Feb 2015 22:59:17 +0100
Subject: [PATCH] Lint issues fixed

---
 .../cpp_wizard_step_choose_theme_preview.xml  | 31 ++++++++++---------
 .../res/layout/main_calculator_mobile.xml     |  3 +-
 .../src/main/res/layout/onscreen_layout.xml   | 18 ++++++-----
 .../src/main/res/layout/widget_layout.xml     | 11 ++++---
 .../res/layout/widget_layout_lockscreen.xml   | 14 +++++----
 5 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
index 2fc66705..98335ff9 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
@@ -23,26 +23,29 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:layout_width="wrap_content"
-	a:layout_height="wrap_content"
-	a:background="?attr/cpp_main_bg"
-	a:minWidth="200dp"
-	a:orientation="vertical"
-	a:padding="3dp">
+			  xmlns:tools="http://schemas.android.com/tools"
+			  a:layout_width="wrap_content"
+			  a:layout_height="wrap_content"
+			  a:background="?attr/cpp_main_bg"
+			  a:minWidth="200dp"
+			  a:orientation="vertical"
+			  a:padding="3dp"
+			  tools:ignore="Overdraw">
 
 	<LinearLayout
 		a:layout_width="match_parent"
 		a:layout_height="wrap_content"
 		a:orientation="horizontal">
 
-		<include layout="@layout/cpp_app_button_equals_no_bg" />
+		<include layout="@layout/cpp_app_button_equals_no_bg"/>
 
 		<TextView
 			style="@style/CppText.Display"
 			a:layout_width="0dp"
 			a:layout_height="match_parent"
 			a:layout_weight="2"
-			a:text="3.1415" />
+			a:text="3.1415"
+			tools:ignore="HardcodedText"/>
 
 	</LinearLayout>
 
@@ -51,11 +54,11 @@
 		a:layout_height="wrap_content"
 		a:orientation="horizontal">
 
-		<include layout="@layout/cpp_app_button_0" />
+		<include layout="@layout/cpp_app_button_0"/>
 
-		<include layout="@layout/cpp_app_button_copy" />
+		<include layout="@layout/cpp_app_button_copy"/>
 
-		<include layout="@layout/cpp_app_button_plus" />
+		<include layout="@layout/cpp_app_button_plus"/>
 
 	</LinearLayout>
 
@@ -64,11 +67,11 @@
 		a:layout_height="wrap_content"
 		a:orientation="horizontal">
 
-		<include layout="@layout/cpp_app_button_1" />
+		<include layout="@layout/cpp_app_button_1"/>
 
-		<include layout="@layout/cpp_app_button_paste" />
+		<include layout="@layout/cpp_app_button_paste"/>
 
-		<include layout="@layout/cpp_app_button_minus" />
+		<include layout="@layout/cpp_app_button_minus"/>
 
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_calculator_mobile.xml b/android-app/src/main/res/layout/main_calculator_mobile.xml
index b3735d2b..149acc8e 100644
--- a/android-app/src/main/res/layout/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout/main_calculator_mobile.xml
@@ -39,7 +39,8 @@
 	<LinearLayout
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="1">
+		a:layout_weight="1"
+		a:baselineAligned="false">
 
 		<include
 			layout="@layout/cpp_app_button_equals_no_bg"
diff --git a/android-app/src/main/res/layout/onscreen_layout.xml b/android-app/src/main/res/layout/onscreen_layout.xml
index 6cb83f26..c2ef34c5 100644
--- a/android-app/src/main/res/layout/onscreen_layout.xml
+++ b/android-app/src/main/res/layout/onscreen_layout.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout style="@style/CppMain.Onscreen"
+<LinearLayout
+	style="@style/CppMain.Onscreen"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical">
 
 	<include
 		a:id="@+id/onscreen_header"
-		layout="@layout/onscreen_header" />
+		layout="@layout/onscreen_header"/>
 
 	<LinearLayout
 		a:id="@+id/onscreen_content"
@@ -17,24 +18,25 @@
 		<include
 			layout="@layout/onscreen_editor"
 			a:layout_width="match_parent"
-			a:layout_height="wrap_content" />
+			a:layout_height="wrap_content"/>
 
 		<LinearLayout
 			a:layout_width="match_parent"
 			a:layout_height="0dp"
-			a:layout_weight="1">
+			a:layout_weight="1"
+			a:baselineAligned="false">
 
 			<include
 				layout="@layout/cpp_simple_button_equals"
 				a:layout_width="0dp"
 				a:layout_height="match_parent"
-				a:layout_weight="1" />
+				a:layout_weight="1"/>
 
 			<include
 				layout="@layout/onscreen_display"
 				a:layout_width="0dp"
 				a:layout_height="wrap_content"
-				a:layout_weight="4" />
+				a:layout_weight="4"/>
 
 		</LinearLayout>
 
@@ -42,9 +44,9 @@
 			layout="@layout/onscreen_keyboard"
 			a:layout_width="match_parent"
 			a:layout_height="0dp"
-			a:layout_weight="4" />
+			a:layout_weight="4"/>
 	</LinearLayout>
 
-	<include layout="@layout/onscreen_footer" />
+	<include layout="@layout/onscreen_footer"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_layout.xml b/android-app/src/main/res/layout/widget_layout.xml
index 36f51bb8..ad9e2064 100644
--- a/android-app/src/main/res/layout/widget_layout.xml
+++ b/android-app/src/main/res/layout/widget_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout style="@style/CppMain.Widget"
+<LinearLayout
+	style="@style/CppMain.Widget"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
@@ -10,7 +11,7 @@
 		layout="@layout/widget_editor"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="2" />
+		a:layout_weight="2"/>
 
 	<LinearLayout
 		a:layout_width="match_parent"
@@ -21,13 +22,13 @@
 			layout="@layout/cpp_simple_button_equals"
 			a:layout_width="0dp"
 			a:layout_height="match_parent"
-			a:layout_weight="1" />
+			a:layout_weight="1"/>
 
 		<include
 			layout="@layout/widget_display"
 			a:layout_width="0dp"
 			a:layout_height="wrap_content"
-			a:layout_weight="5" />
+			a:layout_weight="5"/>
 
 	</LinearLayout>
 
@@ -35,6 +36,6 @@
 		layout="@layout/cpp_simple_keyboard"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="5" />
+		a:layout_weight="5"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_layout_lockscreen.xml b/android-app/src/main/res/layout/widget_layout_lockscreen.xml
index e86c2761..44c281f4 100644
--- a/android-app/src/main/res/layout/widget_layout_lockscreen.xml
+++ b/android-app/src/main/res/layout/widget_layout_lockscreen.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout style="@style/CppMain.Widget"
+<LinearLayout
+	style="@style/CppMain.Widget"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
@@ -10,24 +11,25 @@
 		layout="@layout/widget_editor"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="2" />
+		a:layout_weight="2"/>
 
 	<LinearLayout
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="1">
+		a:layout_weight="1"
+		a:baselineAligned="false">
 
 		<include
 			layout="@layout/cpp_simple_button_equals"
 			a:layout_width="0dp"
 			a:layout_height="match_parent"
-			a:layout_weight="1" />
+			a:layout_weight="1"/>
 
 		<include
 			layout="@layout/widget_display"
 			a:layout_width="0dp"
 			a:layout_height="match_parent"
-			a:layout_weight="5" />
+			a:layout_weight="5"/>
 
 	</LinearLayout>
 
@@ -35,6 +37,6 @@
 		layout="@layout/cpp_simple_keyboard_lockscreen"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="4" />
+		a:layout_weight="4"/>
 
 </LinearLayout>
\ No newline at end of file