Bug 974129 - Part 2: use branding icon instead of fxaccount_icon. r=rnewman, a=sylvestre
authorNick Alexander <nalexander@mozilla.com>
Thu, 13 Mar 2014 22:21:00 -0700
changeset 217439 cc0fd27015055e72756dcf4ac695bce2ccde70eb
parent 217438 63cb74e417c98ad6b3d8ee88c840965348f12ff1
child 217440 b803b67591584e625160af3c47219db3bdee6b5e
push id3
push usergszorc@mozilla.com
push dateWed, 29 Oct 2014 02:45:36 +0000
reviewersrnewman, sylvestre
bugs974129
milestone29.0a2
Bug 974129 - Part 2: use branding icon instead of fxaccount_icon. r=rnewman, a=sylvestre
mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
mobile/android/base/resources/drawable-hdpi/fxaccount_icon.png
mobile/android/base/resources/drawable-mdpi/fxaccount_icon.png
mobile/android/base/resources/values/fxaccount_styles.xml
--- a/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
+++ b/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
@@ -191,17 +191,17 @@ public class FxAccountCreateAccountActiv
           public void onClick(DialogInterface dialog, int which) {
             yearEdit.setText(yearItems[which]);
             updateButtonState();
           }
         };
         final AlertDialog dialog = new AlertDialog.Builder(FxAccountCreateAccountActivity.this)
         .setTitle(R.string.fxaccount_create_account_year_of_birth)
         .setItems(yearItems, listener)
-        .setIcon(R.drawable.fxaccount_icon)
+        .setIcon(R.drawable.icon)
         .create();
 
         dialog.show();
       }
     });
   }
 
   public void createAccount(String email, String password, Map<String, Boolean> engines) {
deleted file mode 100755
index 03a16d427eaed2b195664a088851eaaa6828b153..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b328c7b44144c68fa6d908cdb0b663b1b02d757e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/values/fxaccount_styles.xml
+++ b/mobile/android/base/resources/values/fxaccount_styles.xml
@@ -86,17 +86,17 @@
         <item name="android:gravity">center</item>
     </style>
 
     <style name="FxAccountIcon">
         <item name="android:layout_marginTop">20dp</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:src">@drawable/fxaccount_icon</item>
+        <item name="android:src">@drawable/icon</item>
     </style>
 
     <style name="FxAccountErrorItem">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_marginBottom">10dp</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center_horizontal</item>