checkpoint: slightly better UI for selecting a library

diff --git a/Open-ILS/src/Android/core/res/layout/activity_choose_library.xml b/Open-ILS/src/Android/core/res/layout/activity_choose_library.xml
index 57e0649..65c6256 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/activity_choose_library.xml
+++ b/Open-ILS/src/Android/core/res/layout/activity_choose_library.xml
@@ -18,8 +18,8 @@
         android:id="@+id/choose_library_spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="5dip"
+        android:layout_marginTop="30dip"
+        android:layout_marginBottom="30dip"
         />
 
     <Button android:id="@+id/choose_library_button"

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
index 864e407..b1a87cd 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
@@ -55,7 +55,8 @@ public class ChooseConsortiumActivity extends ActionBarActivity {
                 l.add(consortium.name);
             }
             //ArrayAdapter<String> adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(context, l);
-            ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_item, l);
+            //ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_item, l);
+            ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_dropdown_item, l);
             consortiumSpinner.setAdapter(adapter);
         }
     }
@@ -69,7 +70,6 @@ public class ChooseConsortiumActivity extends ActionBarActivity {
         setContentView(R.layout.activity_choose_library);
 
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
 
         consortiumSpinner = (Spinner) findViewById(R.id.choose_library_spinner);
         button = (Button) findViewById(R.id.choose_library_button);

diff --git a/Open-ILS/src/Android/eg_app/AndroidManifest.xml b/Open-ILS/src/Android/eg_app/AndroidManifest.xml
index 157b16f..be2f068 100644 (file)
--- a/Open-ILS/src/Android/eg_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/eg_app/AndroidManifest.xml
@@ -31,7 +31,7 @@
         </activity>
         <activity
                 android:name="org.evergreen_ils.views.ChooseConsortiumActivity"
-                android:label="@string/choose_library_message">
+                android:label="@string/ou_account_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />