From 6c93aa8c94cbb93040dec15c96b29a9b9cb1aa3e Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Sun, 10 Nov 2013 08:58:59 -0500
Subject: [PATCH] Eliminated warnings by using textSize 16sp not 16dp.  Allow
 dashboard_account view to go landscape.

---
 .../Android/res/layout-land/dashbord_account.xml   | 73 +++++++++-------------
 .../Android/res/layout-land/search_result_list.xml |  2 +-
 .../src/Android/res/layout/dashbord_account.xml    |  2 +-
 .../src/Android/res/layout/search_result_list.xml  |  2 +-
 .../src/Android/res/layout/simple_actionbar.xml    |  2 +-
 Open-ILS/src/Android/res/values/strings.xml        |  2 +-
 6 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/Open-ILS/src/Android/res/layout-land/dashbord_account.xml b/Open-ILS/src/Android/res/layout-land/dashbord_account.xml
index 7bf5d7ada2..01ea120f56 100644
--- a/Open-ILS/src/Android/res/layout-land/dashbord_account.xml
+++ b/Open-ILS/src/Android/res/layout-land/dashbord_account.xml
@@ -25,7 +25,7 @@
             android:paddingLeft="5dip"
             android:text="@string/library_text_logo"
             android:textColor="@color/white"
-            android:textSize="16dp"
+            android:textSize="16sp"
             android:textStyle="bold"
             android:typeface="monospace" />
 
@@ -48,56 +48,43 @@
 
         <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:gravity="center"
-            android:orientation="vertical"
-            
-             >
+            android:orientation="horizontal" >
 
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+            <Button
+                android:id="@+id/account_btn_check_out"
+                style="@style/HomeButton"
                 android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/account_btn_check_out"
-                    style="@style/HomeButton"
-                    android:drawableTop="@drawable/check_out"
-                    android:onClick="onClickFeature"
-                    android:text="@string/title_check_out" />
-
-                <Button
-                    android:id="@+id/account_btn_holds"
-                    style="@style/HomeButton"
-                    android:drawableTop="@drawable/holds"
-                    android:onClick="onClickFeature"
-                    android:text="@string/title_holds" />
-            </LinearLayout>
+                android:drawableTop="@drawable/check_out"
+                android:onClick="onClickFeature"
+                android:text="@string/title_check_out" />
 
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+            <Button
+                android:id="@+id/account_btn_holds"
+                style="@style/HomeButton"
                 android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal" >
+                android:drawableTop="@drawable/holds"
+                android:onClick="onClickFeature"
+                android:text="@string/title_holds" />
 
-                <Button
-                    android:id="@+id/account_btn_fines"
-                    style="@style/HomeButton"
-                    android:drawableTop="@drawable/fines"
-                    android:onClick="onClickFeature"
-                    android:text="@string/title_fines" />
+            <Button
+                android:id="@+id/account_btn_fines"
+                style="@style/HomeButton"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/fines"
+                android:onClick="onClickFeature"
+                android:text="@string/title_fines" />
 
-                <Button
-                    android:id="@+id/account_btn_book_bags"
-                    style="@style/HomeButton"
-                    android:drawableTop="@drawable/book_bag"
-                    android:onClick="onClickFeature"
-                    android:text="@string/title_book_bags" />
-            </LinearLayout>
+            <Button
+                android:id="@+id/account_btn_book_bags"
+                style="@style/HomeButton"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/book_bag"
+                android:onClick="onClickFeature"
+                android:text="@string/title_book_bags" />
         </LinearLayout>
+
     </ScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout-land/search_result_list.xml b/Open-ILS/src/Android/res/layout-land/search_result_list.xml
index 227d788eb8..c68fce3bf2 100644
--- a/Open-ILS/src/Android/res/layout-land/search_result_list.xml
+++ b/Open-ILS/src/Android/res/layout-land/search_result_list.xml
@@ -24,7 +24,7 @@
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:text="@string/library_text_logo" 
             android:textColor="@color/white"
-            android:textSize="16dp"
+            android:textSize="16sp"
             android:typeface="monospace"
             android:textStyle="bold"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/res/layout/dashbord_account.xml b/Open-ILS/src/Android/res/layout/dashbord_account.xml
index 97ae3e82dd..670bc39c6b 100644
--- a/Open-ILS/src/Android/res/layout/dashbord_account.xml
+++ b/Open-ILS/src/Android/res/layout/dashbord_account.xml
@@ -26,7 +26,7 @@
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:text="@string/library_text_logo" 
             android:textColor="@color/white"
-            android:textSize="16dp"
+            android:textSize="16sp"
             android:typeface="monospace"
             android:textStyle="bold"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/res/layout/search_result_list.xml b/Open-ILS/src/Android/res/layout/search_result_list.xml
index cc1c24efef..610e80f3a0 100644
--- a/Open-ILS/src/Android/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/res/layout/search_result_list.xml
@@ -25,7 +25,7 @@
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:text="@string/library_text_logo" 
             android:textColor="@color/white"
-            android:textSize="16dp"
+            android:textSize="16sp"
             android:typeface="monospace"
             android:textStyle="bold"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/res/layout/simple_actionbar.xml b/Open-ILS/src/Android/res/layout/simple_actionbar.xml
index fcefdcbbfb..54883ff60d 100644
--- a/Open-ILS/src/Android/res/layout/simple_actionbar.xml
+++ b/Open-ILS/src/Android/res/layout/simple_actionbar.xml
@@ -26,7 +26,7 @@
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:text="@string/library_text_logo" 
             android:textColor="@color/white"
-            android:textSize="16dp"
+            android:textSize="16sp"
             android:typeface="monospace"
             android:textStyle="bold"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index 630dd425f5..34ad835d68 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -45,7 +45,7 @@
     
     <string name="loading_dialog_text"></string>
     <string name="dialog_please_wait">Please wait</string>
-    <string name="dialog_fetching_data_message">Fetching data</string>
+    <string name="dialog_fetching_data_message">Searching catalog</string>
     <string name="dialog_load_more_message">Fetching more results</string>
     
     <string name="advanced_search_hint">Enter text here</string>
-- 
2.11.0