From 95af5c86db557b4f11db78864b6f8d8f1004318b Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Tue, 17 Dec 2013 20:53:08 -0500
Subject: [PATCH] Standardizing ou.xml elements, removing unused ones. 
 Removing unpleasant red bold text for fines and and gradient separators.

---
 Open-ILS/src/Android/core/AndroidManifest.xml      |  13 +-
 .../core/res/drawable/list_view_separator.xml      |  13 --
 .../core/res/layout-land/dashbord_account.xml      |   2 +-
 .../core/res/layout-land/search_result_list.xml    |   2 +-
 .../Android/core/res/layout/activity_splash.xml    |   2 +-
 .../src/Android/core/res/layout/bookbag_list.xml   |   1 -
 .../Android/core/res/layout/bookbagitem_list.xml   |   1 -
 .../Android/core/res/layout/dashbord_account.xml   |   2 +-
 Open-ILS/src/Android/core/res/layout/fines.xml     | 135 ++++++++++-----------
 .../Android/core/res/layout/fines_list_item.xml    |   1 -
 .../src/Android/core/res/layout/holds_list.xml     |   3 +-
 .../Android/core/res/layout/search_result_list.xml |   3 +-
 .../Android/core/res/layout/simple_actionbar.xml   |   2 +-
 Open-ILS/src/Android/core/res/values/ou.xml        |  14 +--
 Open-ILS/src/Android/core/res/values/strings.xml   |   6 +-
 .../android/accountAccess/fines/FinesActivity.java |   5 -
 .../src/Android/cwmars_app/AndroidManifest.xml     |  11 +-
 Open-ILS/src/Android/cwmars_app/res/values/ou.xml  |   9 +-
 Open-ILS/src/Android/demo_app/AndroidManifest.xml  |  11 +-
 Open-ILS/src/Android/demo_app/res/values/ou.xml    |   9 +-
 20 files changed, 100 insertions(+), 145 deletions(-)
 delete mode 100644 Open-ILS/src/Android/core/res/drawable/list_view_separator.xml

diff --git a/Open-ILS/src/Android/core/AndroidManifest.xml b/Open-ILS/src/Android/core/AndroidManifest.xml
index d2f9f6db50..f6d03ff4c8 100644
--- a/Open-ILS/src/Android/core/AndroidManifest.xml
+++ b/Open-ILS/src/Android/core/AndroidManifest.xml
@@ -32,7 +32,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
-        android:label="@string/ou_app_name"
+        android:label="@string/ou_app_label"
         android:theme="@style/EvergreenTheme" >
 
         <!-- Notification receiver -->
@@ -57,7 +57,7 @@
 
         <activity
             android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-            android:label="@string/ou_app_label">
+            >
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -74,21 +74,16 @@
 
         <!-- Search -->
 
-        <activity
-            android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade"
-            android:label="Underlines/No Fade" >
+        <activity android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade">
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >
         </activity>
-        <activity
-            android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-            android:label="@string/ou_app_label" >
+        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
         </activity>
         <activity
             android:name="org.evergreen.android.barcodescan.CaptureActivity"
-            android:label="@string/ou_app_label"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="stateAlwaysHidden" >
diff --git a/Open-ILS/src/Android/core/res/drawable/list_view_separator.xml b/Open-ILS/src/Android/core/res/drawable/list_view_separator.xml
deleted file mode 100644
index 1ed1ae0417..0000000000
--- a/Open-ILS/src/Android/core/res/drawable/list_view_separator.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Bottom 2dp Shadow -->
-    <item>
-        <shape android:shape="rectangle">
-            <gradient 
-                android:startColor="#000"
-                android:centerColor="#42b8cd"
-                android:endColor="#000"
-                />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml b/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
index 18bd5183b3..15a3159bdb 100644
--- a/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
+++ b/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
@@ -23,7 +23,7 @@
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:paddingLeft="5dip"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             />
diff --git a/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml b/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
index a0ce3434bd..07f0293a6c 100644
--- a/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
+++ b/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
@@ -22,7 +22,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/core/res/layout/activity_splash.xml b/Open-ILS/src/Android/core/res/layout/activity_splash.xml
index 4df99cb13e..0fe10c2e1a 100644
--- a/Open-ILS/src/Android/core/res/layout/activity_splash.xml
+++ b/Open-ILS/src/Android/core/res/layout/activity_splash.xml
@@ -14,7 +14,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="106dp"
             android:src="@drawable/evergreen_logo_sm072"
-            android:contentDescription="@string/ou_action_bar_text" />
+            android:contentDescription="@string/ou_app_label" />
     
         <TextView
             android:id="@+id/action_in_progress"
diff --git a/Open-ILS/src/Android/core/res/layout/bookbag_list.xml b/Open-ILS/src/Android/core/res/layout/bookbag_list.xml
index c8e1bc62bf..02ff45e3df 100644
--- a/Open-ILS/src/Android/core/res/layout/bookbag_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/bookbag_list.xml
@@ -88,7 +88,6 @@
 	  android:layout_width="fill_parent"
 	  android:layout_height="wrap_content"  
 	  android:paddingTop="10dip"
-	  android:divider="@drawable/list_view_separator"
       android:dividerHeight="1dp"
 	  ></ListView>
 
diff --git a/Open-ILS/src/Android/core/res/layout/bookbagitem_list.xml b/Open-ILS/src/Android/core/res/layout/bookbagitem_list.xml
index 1cb06340c7..e4d1ca0505 100644
--- a/Open-ILS/src/Android/core/res/layout/bookbagitem_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/bookbagitem_list.xml
@@ -46,7 +46,6 @@
 	  android:layout_height="wrap_content"  
 	  android:paddingTop="10dip"
 	  android:background="@drawable/listview_background"
-	  android:divider="@drawable/list_view_separator"
       android:dividerHeight="1dp"
 	  ></ListView>
 
diff --git a/Open-ILS/src/Android/core/res/layout/dashbord_account.xml b/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
index 78e55162ec..2688d54e52 100644
--- a/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
+++ b/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
@@ -24,7 +24,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/core/res/layout/fines.xml b/Open-ILS/src/Android/core/res/layout/fines.xml
index b45ce9ca1d..f3e799b92b 100644
--- a/Open-ILS/src/Android/core/res/layout/fines.xml
+++ b/Open-ILS/src/Android/core/res/layout/fines.xml
@@ -7,81 +7,80 @@
      >
 
    	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-    
-         <TableLayout 
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:padding="5dip"
-             >
-            <TableRow 
+
+    <TableLayout
+         android:layout_width="fill_parent"
+         android:layout_height="wrap_content"
+         android:padding="5dip"
+         >
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            >
+
+            <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                >
-                
-                <TextView 
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/total_owned"
-                    />
-                <TextView 
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/total_paid"
-                    />
-                
-                <TextView 
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/balance_owed"
-                    />
-                
-            </TableRow>
-             <TableRow 
+                android:layout_weight="1"
+                android:text="@string/total_owned"
+                />
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/total_paid"
+                />
+
+            <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                >
-                <TextView 
-                    android:id="@+id/fines_total_owned"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-                <TextView 
-                    android:id="@+id/fines_total_paid"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-                <TextView 
-                    android:id="@+id/fined_balance_owed"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-            </TableRow>
+                android:layout_weight="1"
+                android:text="@string/balance_owed"
+                />
+
+        </TableRow>
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            >
+            <TextView
+                android:id="@+id/fines_total_owned"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+            <TextView
+                android:id="@+id/fines_total_paid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+            <TextView
+                android:id="@+id/fined_balance_owed"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+        </TableRow>
+
+     </TableLayout>
 
-         </TableLayout>
 
-        
-         <TextView 
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:text="@string/overdue_materials"
-             android:textSize="18sp"
-             android:paddingTop="10dip"
-             android:paddingBottom="5dip"
-             android:layout_marginLeft="10dip"
-             />
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/overdue_materials"
+        android:textSize="18sp"
+        android:paddingTop="10dip"
+        android:paddingBottom="5dip"
+        android:layout_marginLeft="5dip"
+        />
 
 	<ListView 
-	  android:id="@+id/fines_overdue_materials_list"
-	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"
-	  android:divider="@drawable/list_view_separator"
-      android:dividerHeight="1dp"  
-	></ListView>
+        android:id="@+id/fines_overdue_materials_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:dividerHeight="1dp"
+        />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/layout/fines_list_item.xml b/Open-ILS/src/Android/core/res/layout/fines_list_item.xml
index 8daeab567d..de57622f00 100644
--- a/Open-ILS/src/Android/core/res/layout/fines_list_item.xml
+++ b/Open-ILS/src/Android/core/res/layout/fines_list_item.xml
@@ -23,7 +23,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:layout_weight="0"
-                android:textColor="@color/red"
                 android:textStyle="bold" />
         </LinearLayout>
 
diff --git a/Open-ILS/src/Android/core/res/layout/holds_list.xml b/Open-ILS/src/Android/core/res/layout/holds_list.xml
index f7974c666c..99c9c7799d 100644
--- a/Open-ILS/src/Android/core/res/layout/holds_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/holds_list.xml
@@ -33,8 +33,7 @@
 	  android:id="@+id/holds_item_list"
 	  android:layout_width="fill_parent"
 	  android:layout_height="fill_parent"
-	  android:divider="@drawable/list_view_separator"
-      android:dividerHeight="1dp"  
+      android:dividerHeight="1dp"
 	></ListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/layout/search_result_list.xml b/Open-ILS/src/Android/core/res/layout/search_result_list.xml
index bc82ae2a84..09b21b1585 100644
--- a/Open-ILS/src/Android/core/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/search_result_list.xml
@@ -23,7 +23,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"/>
@@ -170,7 +170,6 @@
         android:id="@+id/search_results_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:divider="@drawable/list_view_separator"
         android:dividerHeight="1dp"
         android:layout_below="@id/search_text" >
     </ListView>
diff --git a/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml b/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
index 9e0880e449..d25829b703 100644
--- a/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
+++ b/Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
@@ -24,7 +24,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"
diff --git a/Open-ILS/src/Android/core/res/values/ou.xml b/Open-ILS/src/Android/core/res/values/ou.xml
index 4f514d0d1e..a722551ed2 100644
--- a/Open-ILS/src/Android/core/res/values/ou.xml
+++ b/Open-ILS/src/Android/core/res/values/ou.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- ou_cwmars.xml - C/W MARS organizational unit -->
 <resources>
+    <string name="ou_account_label">Evergreen Library</string>
+    <string name="ou_account_sign_in_message">Sign in to your\nEvergreen Library Account</string>
     <!-- Each evergreen-derived app should have its own ou_account_type. This will enable
          a user to have multiple evergreen-derived apps working simultaneously. -->
     <string name="ou_account_type">org.evergreen_ils</string>
-    <!--  TODO: make URLs HTTPS -->
-    <string name="ou_library_url">http://bark.cwmars.org</string>
-    <string name="ou_app_name">C/W Mars Library</string>
-    <string name="ou_app_label">C/W Mars Library</string>
-    <string name="ou_app_welcome_label">Welcome</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>
-    <string name="ou_action_bar_text">C/W Mars</string>
+    <string name="ou_app_label">Evergreen Library</string>
+    <string name="ou_app_name">Evergreen Library</string>
+    <string name="ou_library_url">https://demo.evergreencatalog.com</string>
 </resources>
diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml
index 5df739810c..71160bf2c0 100644
--- a/Open-ILS/src/Android/core/res/values/strings.xml
+++ b/Open-ILS/src/Android/core/res/values/strings.xml
@@ -136,15 +136,15 @@
     <string name="preference_notifications_title">Notification settings</string>
 
     <plurals name="number_of_copies">
-        <item quantity="one">one copy</item>
+        <item quantity="one">1 copy</item>
         <item quantity="other">%d copies</item>
     </plurals>
     <plurals name="number_of_holds">
-        <item quantity="one">One hold</item>
+        <item quantity="one">1 hold</item>
         <item quantity="other">%d holds</item>
     </plurals>
     <plurals name="number_of_items">
-        <item quantity="one">one item</item>
+        <item quantity="one">1 item</item>
         <item quantity="other">%d items</item>
     </plurals>
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
index ddb4d750a6..7312a2a8b3 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
@@ -235,11 +235,6 @@ public class FinesActivity extends Activity {
             // status.setText(record.getHoldStatus());
             fineStatus.setText(record.getStatus());
 
-            if (record.getStatus().equals("returned")) {
-                fineStatus.setTextColor(Color.argb(255, 0, 255, 0));
-            } else
-                fineStatus.setTextColor(Color.argb(255, 255, 0, 0));
-
             return row;
         }
     }
diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index e325857e4d..bb99a1cd7c 100644
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
-        android:label="@string/ou_app_name"
+        android:label="@string/ou_app_label"
         android:theme="@style/EvergreenTheme" >
 
         <!-- Notification receiver -->
@@ -50,9 +50,7 @@
         <service android:name="org.evergreen.android.services.ScheduledIntentService" >
         </service>
 
-        <activity
-            android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-            android:label="@string/ou_app_label">
+        <activity android:name="org.evergreen.android.views.splashscreen.SplashActivity">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -75,15 +73,12 @@
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >
         </activity>
-        <activity
-            android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-            android:label="@string/ou_app_label" >
+        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
         </activity>
         <activity
             android:name="org.evergreen.android.barcodescan.CaptureActivity"
-            android:label="@string/ou_app_label"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="stateAlwaysHidden" >
diff --git a/Open-ILS/src/Android/cwmars_app/res/values/ou.xml b/Open-ILS/src/Android/cwmars_app/res/values/ou.xml
index 9b5b79ff35..b5833cf724 100644
--- a/Open-ILS/src/Android/cwmars_app/res/values/ou.xml
+++ b/Open-ILS/src/Android/cwmars_app/res/values/ou.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ou_cwmars.xml - C/W MARS organizational unit -->
 <resources>
-    <!--  TODO: make URLs HTTPS -->
-    <string name="ou_library_url">http://bark.cwmars.org</string>
-    <string name="ou_app_name">C/W Mars Library</string>
-    <string name="ou_app_label">C/W Mars</string>
-    <string name="ou_app_welcome_label">Welcome</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>
+    <string name="ou_account_type">org.cwmars</string>
+    <string name="ou_app_label">C/W Mars</string>
+    <string name="ou_app_name">C/W Mars Library Free</string>
+    <string name="ou_library_url">http://bark.cwmars.org</string> <!--  TODO: make HTTPS -->
 </resources>
diff --git a/Open-ILS/src/Android/demo_app/AndroidManifest.xml b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
index e23ed14f08..d4a0f5eada 100644
--- a/Open-ILS/src/Android/demo_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
-        android:label="@string/ou_app_name"
+        android:label="@string/ou_app_label"
         android:theme="@style/EvergreenTheme" >
 
         <!-- Notification receiver -->
@@ -50,9 +50,7 @@
         <service android:name="org.evergreen.android.services.ScheduledIntentService">
         </service>
 
-        <activity
-                android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-                android:label="@string/ou_app_label">
+        <activity android:name="org.evergreen.android.views.splashscreen.SplashActivity">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -75,15 +73,12 @@
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation">
         </activity>
-        <activity
-                android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-                android:label="@string/ou_app_label">
+        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity">
         </activity>
         <activity
                 android:name="org.evergreen.android.barcodescan.CaptureActivity"
-                android:label="@string/ou_app_label"
                 android:screenOrientation="landscape"
                 android:theme="@android:style/Theme.NoTitleBar"
                 android:windowSoftInputMode="stateAlwaysHidden">
diff --git a/Open-ILS/src/Android/demo_app/res/values/ou.xml b/Open-ILS/src/Android/demo_app/res/values/ou.xml
index b7a85c2aba..a5261d7370 100644
--- a/Open-ILS/src/Android/demo_app/res/values/ou.xml
+++ b/Open-ILS/src/Android/demo_app/res/values/ou.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ou.xml - organizational unit app customization -->
 <resources>
-    <string name="ou_account_type">com.evergreencatalog.demo</string>
-    <string name="ou_library_url">http://demo.evergreencatalog.com</string>
-    <string name="ou_app_name">Evergreen Demo Library</string>
-    <string name="ou_app_label">Evergreen Demo</string>
-    <string name="ou_app_welcome_label">Welcome</string>
     <string name="ou_account_label">Evergreen Demo Library</string>
     <string name="ou_account_sign_in_message">Sign in to your\nEvergreen Demo Library Account</string>
+    <string name="ou_account_type">com.evergreencatalog.demo</string>
+    <string name="ou_app_label">Evergreen Demo</string>
+    <string name="ou_app_name">Evergreen Demo Library</string>
+    <string name="ou_library_url">http://demo.evergreencatalog.com</string>
 </resources>
-- 
2.11.0