Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman, a=sylvestre
authorNick Alexander <nalexander@mozilla.com>
Mon, 07 Apr 2014 11:37:56 -0700
changeset 183651 26f9d2df24af
parent 183650 004a7c15d761
child 183658 1a92004a684f
push id3435
push usernalexander@mozilla.com
push date2014-04-07 18:44 +0000
treeherdermozilla-beta@26f9d2df24af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, sylvestre
bugs967022
milestone29.0
Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman, a=sylvestre
mobile/android/base/resources/layout/fxaccount_create_account.xml
mobile/android/base/resources/layout/fxaccount_sign_in.xml
mobile/android/base/resources/layout/fxaccount_update_credentials.xml
mobile/android/base/resources/values/fxaccount_styles.xml
--- a/mobile/android/base/resources/layout/fxaccount_create_account.xml
+++ b/mobile/android/base/resources/layout/fxaccount_create_account.xml
@@ -53,21 +53,17 @@
             style="@style/FxAccountErrorItem" />
 
         <RelativeLayout
             style="@style/FxAccountButtonLayout"
             android:layout_marginBottom="10dp" >
 
             <ProgressBar
                 android:id="@+id/progress"
-                style="@style/FxAccountProgress"
-                android:layout_alignBottom="@id/button"
-                android:layout_alignLeft="@id/button"
-                android:layout_alignRight="@id/button"
-                android:layout_alignTop="@id/button" />
+                style="@style/FxAccountProgress" />
 
             <Button
                 android:id="@+id/button"
                 style="@style/FxAccountButton"
                 android:text="@string/fxaccount_create_account_button" />
         </RelativeLayout>
 
         <CheckBox
@@ -88,9 +84,9 @@
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
             android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>
\ No newline at end of file
--- a/mobile/android/base/resources/layout/fxaccount_sign_in.xml
+++ b/mobile/android/base/resources/layout/fxaccount_sign_in.xml
@@ -25,21 +25,17 @@
         <TextView
             android:id="@+id/remote_error"
             style="@style/FxAccountErrorItem" />
 
         <RelativeLayout style="@style/FxAccountButtonLayout" >
 
             <ProgressBar
                 android:id="@+id/progress"
-                style="@style/FxAccountProgress"
-                android:layout_alignBottom="@id/button"
-                android:layout_alignLeft="@id/button"
-                android:layout_alignRight="@id/button"
-                android:layout_alignTop="@id/button" />
+                style="@style/FxAccountProgress" />
 
             <Button
                 android:id="@+id/button"
                 style="@style/FxAccountButton"
                 android:text="@string/fxaccount_sign_in_button_label" />
         </RelativeLayout>
 
         <LinearLayout
--- a/mobile/android/base/resources/layout/fxaccount_update_credentials.xml
+++ b/mobile/android/base/resources/layout/fxaccount_update_credentials.xml
@@ -25,21 +25,17 @@
         <TextView
             android:id="@+id/remote_error"
             style="@style/FxAccountErrorItem" />
 
         <RelativeLayout style="@style/FxAccountButtonLayout" >
 
             <ProgressBar
                 android:id="@+id/progress"
-                style="@style/FxAccountProgress"
-                android:layout_alignBottom="@id/button"
-                android:layout_alignLeft="@id/button"
-                android:layout_alignRight="@id/button"
-                android:layout_alignTop="@id/button" />
+                style="@style/FxAccountProgress" />
 
             <Button
                 android:id="@+id/button"
                 style="@style/FxAccountButton"
                 android:text="@string/fxaccount_update_credentials_button_label" />
         </RelativeLayout>
 
         <TextView
--- a/mobile/android/base/resources/values/fxaccount_styles.xml
+++ b/mobile/android/base/resources/values/fxaccount_styles.xml
@@ -5,17 +5,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="FxAccountTheme" parent="@style/Gecko" />
 
     <style name="FxAccountTheme.FxAccountStatusActivity" parent="@style/FxAccountTheme">
-         <item name="android:windowNoTitle">false</item>
+        <item name="android:windowNoTitle">false</item>
     </style>
 
     <style name="FxAccountMiddle">
         <item name="android:background">@android:color/white</item>
         <item name="android:orientation">vertical</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
@@ -105,28 +105,29 @@
         <item name="android:text">Error</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:textColorLink">@android:color/white</item>
         <item name="android:textSize">18sp</item>
         <item name="android:visibility">invisible</item>
     </style>
 
     <style name="FxAccountProgress">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">fill_parent</item>
-        <item name="android:background">@drawable/fxaccount_button_background</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerInParent">true</item>
         <item name="android:visibility">invisible</item>
     </style>
 
     <style name="FxAccountButtonLayout">
         <item name="android:orientation">vertical</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/fxaccount_button_background</item>
     </style>
 
     <style name="FxAccountCheckBox">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">10dp</item>
         <item name="android:textColor">@drawable/fxaccount_checkbox_textcolor</item>
     </style>
 
-</resources>
+</resources>
\ No newline at end of file