Lint issues fixed

This commit is contained in:
serso 2015-02-18 22:59:17 +01:00
parent f8cf95c431
commit 9fc1ee214c
5 changed files with 43 additions and 34 deletions

View File

@ -23,26 +23,29 @@
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:background="?attr/cpp_main_bg" a:background="?attr/cpp_main_bg"
a:minWidth="200dp" a:minWidth="200dp"
a:orientation="vertical" a:orientation="vertical"
a:padding="3dp"> a:padding="3dp"
tools:ignore="Overdraw">
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="horizontal"> a:orientation="horizontal">
<include layout="@layout/cpp_app_button_equals_no_bg" /> <include layout="@layout/cpp_app_button_equals_no_bg"/>
<TextView <TextView
style="@style/CppText.Display" style="@style/CppText.Display"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="2" a:layout_weight="2"
a:text="3.1415" /> a:text="3.1415"
tools:ignore="HardcodedText"/>
</LinearLayout> </LinearLayout>
@ -51,11 +54,11 @@
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="horizontal"> 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> </LinearLayout>
@ -64,11 +67,11 @@
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="horizontal"> 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>
</LinearLayout> </LinearLayout>

View File

@ -39,7 +39,8 @@
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="1"> a:layout_weight="1"
a:baselineAligned="false">
<include <include
layout="@layout/cpp_app_button_equals_no_bg" layout="@layout/cpp_app_button_equals_no_bg"

View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"> a:orientation="vertical">
<include <include
a:id="@+id/onscreen_header" a:id="@+id/onscreen_header"
layout="@layout/onscreen_header" /> layout="@layout/onscreen_header"/>
<LinearLayout <LinearLayout
a:id="@+id/onscreen_content" a:id="@+id/onscreen_content"
@ -17,24 +18,25 @@
<include <include
layout="@layout/onscreen_editor" layout="@layout/onscreen_editor"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" /> a:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="1"> a:layout_weight="1"
a:baselineAligned="false">
<include <include
layout="@layout/cpp_simple_button_equals" layout="@layout/cpp_simple_button_equals"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1" /> a:layout_weight="1"/>
<include <include
layout="@layout/onscreen_display" layout="@layout/onscreen_display"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="4" /> a:layout_weight="4"/>
</LinearLayout> </LinearLayout>
@ -42,9 +44,9 @@
layout="@layout/onscreen_keyboard" layout="@layout/onscreen_keyboard"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="4" /> a:layout_weight="4"/>
</LinearLayout> </LinearLayout>
<include layout="@layout/onscreen_footer" /> <include layout="@layout/onscreen_footer"/>
</LinearLayout> </LinearLayout>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
@ -10,7 +11,7 @@
layout="@layout/widget_editor" layout="@layout/widget_editor"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="2" /> a:layout_weight="2"/>
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
@ -21,13 +22,13 @@
layout="@layout/cpp_simple_button_equals" layout="@layout/cpp_simple_button_equals"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1" /> a:layout_weight="1"/>
<include <include
layout="@layout/widget_display" layout="@layout/widget_display"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="5" /> a:layout_weight="5"/>
</LinearLayout> </LinearLayout>
@ -35,6 +36,6 @@
layout="@layout/cpp_simple_keyboard" layout="@layout/cpp_simple_keyboard"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="5" /> a:layout_weight="5"/>
</LinearLayout> </LinearLayout>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
@ -10,24 +11,25 @@
layout="@layout/widget_editor" layout="@layout/widget_editor"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="2" /> a:layout_weight="2"/>
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="1"> a:layout_weight="1"
a:baselineAligned="false">
<include <include
layout="@layout/cpp_simple_button_equals" layout="@layout/cpp_simple_button_equals"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1" /> a:layout_weight="1"/>
<include <include
layout="@layout/widget_display" layout="@layout/widget_display"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="5" /> a:layout_weight="5"/>
</LinearLayout> </LinearLayout>
@ -35,6 +37,6 @@
layout="@layout/cpp_simple_keyboard_lockscreen" layout="@layout/cpp_simple_keyboard_lockscreen"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="4" /> a:layout_weight="4"/>
</LinearLayout> </LinearLayout>