From b7fd115118432b6cbdd58753131a7da919a5d373 Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Sun, 17 Nov 2013 22:07:01 -0500
Subject: [PATCH] Tweaking resources.

---
 Open-ILS/src/Android/AndroidManifest.xml           | 15 +++++++++------
 Open-ILS/src/Android/res/layout/activity_login.xml | 15 +++++++++++++++
 Open-ILS/src/Android/res/values/ou.xml             |  6 ++++--
 Open-ILS/src/Android/res/values/strings.xml        |  2 +-
 Open-ILS/src/Android/res/xml/authenticator.xml     |  2 +-
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml
index f03bb4016d..dbc80c22ac 100644
--- a/Open-ILS/src/Android/AndroidManifest.xml
+++ b/Open-ILS/src/Android/AndroidManifest.xml
@@ -55,7 +55,7 @@
 
         <activity
             android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-            android:label="@string/ou_app_name"
+            android:label="@string/ou_app_label"
             android:theme="@android:style/Theme.Light.NoTitleBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -65,7 +65,7 @@
         </activity>
         <activity
             android:name="org.evergreen.android.views.MainScreenDashboard"
-            android:label="@string/ou_app_name"
+            android:label="@string/ou_app_label"
             android:theme="@android:style/Theme.Light.NoTitleBar" >
         </activity>
         <activity
@@ -89,13 +89,13 @@
         </activity>
         <activity
             android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-            android:label="@string/ou_app_name" >
+            android:label="@string/ou_app_label" >
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
         </activity>
         <activity
             android:name="org.evergreen.android.barcodescan.CaptureActivity"
-            android:label="@string/ou_app_name"
+            android:label="@string/ou_app_label"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="stateAlwaysHidden" >
@@ -129,9 +129,12 @@
         </activity>
         <activity
             android:name="org.evergreen_ils.auth.AuthenticatorActivity"
-            android:label="@string/ou_app_label">
+            android:label="@string/ou_account_label"
+            android:theme="@android:style/Theme.Light">
         </activity>
-        <service android:name="org.evergreen_ils.auth.AuthenticatorService">
+        <service 
+            android:name="org.evergreen_ils.auth.AuthenticatorService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
diff --git a/Open-ILS/src/Android/res/layout/activity_login.xml b/Open-ILS/src/Android/res/layout/activity_login.xml
index 7fb3f364b5..714f6d3c22 100644
--- a/Open-ILS/src/Android/res/layout/activity_login.xml
+++ b/Open-ILS/src/Android/res/layout/activity_login.xml
@@ -7,6 +7,21 @@
               android:paddingRight="17dp"
         >
 
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ou_account_sign_in_message"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+    
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:background="#000000"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        />
+
     <EditText android:id="@+id/accountName"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/Open-ILS/src/Android/res/values/ou.xml b/Open-ILS/src/Android/res/values/ou.xml
index fd0d204611..268c2bed1d 100644
--- a/Open-ILS/src/Android/res/values/ou.xml
+++ b/Open-ILS/src/Android/res/values/ou.xml
@@ -3,6 +3,8 @@
 <resources>
     <!--  TODO: make this HTTPS -->
     <string name="ou_gateway_url">http://bark.cwmars.org/osrf-gateway-v1</string>
-    <string name="ou_app_name">C/W Mars Rover</string>
-    <string name="ou_app_label">C/W Mars Rover</string>
+    <string name="ou_app_name">C/W Mars Library Rover</string>
+    <string name="ou_app_label">C/W Mars</string>
+    <string name="ou_account_label">C/W Mars Library</string>
+    <string name="ou_account_sign_in_message">Sign in to your\nC/W Mars Library Account</string>
 </resources>
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index 3404bb31e8..f6faaceb60 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="first_config_message">Please enter the Evergreen server url, username and password of your account.</string>
     <string name="server_name">Library Catalog URL:</string>
     <string name="username">Username:</string>
-    <string name="hint_username">Library Card Number or Username</string>
+    <string name="hint_username">Card Number or Username</string>
     <string name="password">Password:</string>
     <string name="hint_password">Password or PIN</string>
     <string name="action_sign_in">Sign in</string>
diff --git a/Open-ILS/src/Android/res/xml/authenticator.xml b/Open-ILS/src/Android/res/xml/authenticator.xml
index 0f3566501c..f724c41761 100644
--- a/Open-ILS/src/Android/res/xml/authenticator.xml
+++ b/Open-ILS/src/Android/res/xml/authenticator.xml
@@ -3,4 +3,4 @@
                        android:accountType="org.evergreen_ils.opac"
                        android:icon="@drawable/evergreen_launcher_icon"
                        android:smallIcon="@drawable/evergreen_launcher_icon"
-                       android:label="@string/ou_app_label"/>
+                       android:label="@string/ou_account_label"/>
-- 
2.11.0