From: kenstir <kenstir@gmail.com>
Date: Wed, 27 Nov 2013 01:09:44 +0000 (-0500)
Subject: fixed progressbar rendering on Gingerbread (don't stretch it)
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c10d80f370b254ca93a7f9f760a17e4c306cf4c6;p=working%2FEvergreen.git

fixed progressbar rendering on Gingerbread (don't stretch it)
---

diff --git a/Open-ILS/src/Android/res/layout/activity_splash.xml b/Open-ILS/src/Android/res/layout/activity_splash.xml
index 3e276328cc..8e0bdd5f99 100644
--- a/Open-ILS/src/Android/res/layout/activity_splash.xml
+++ b/Open-ILS/src/Android/res/layout/activity_splash.xml
@@ -24,15 +24,6 @@
             android:gravity="center"
             android:paddingTop="10dip" />
 
-        <ProgressBar
-            android:id="@+id/activity_splash_progress_bar"
-            style="@android:style/Widget.ProgressBar.Large"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/logo"
-            android:paddingTop="40dip" />
-
         <Button
             android:id="@+id/activity_splash_retry_button"
             android:layout_width="wrap_content"
@@ -44,4 +35,13 @@
             android:visibility="gone"
             />
 
+        <ProgressBar
+            android:id="@+id/activity_splash_progress_bar"
+            style="@android:style/Widget.ProgressBar.Large"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/action_in_progress"
+            android:layout_centerHorizontal="true"
+            android:paddingTop="40dip" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/activity_startup.xml b/Open-ILS/src/Android/res/layout/activity_startup.xml
deleted file mode 100644
index 0d43864a57..0000000000
--- a/Open-ILS/src/Android/res/layout/activity_startup.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".StartupActivity" >
-
-    <LinearLayout
-        android:id="@+id/login_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-    >
-
-        <ProgressBar
-            android:id="@+id/login_progress"
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/login_progress_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:fontFamily="sans-serif-light"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-</merge>