Avoid tinting the profile icon for FxA honeycomb (#2334)

MozillaReality · Nov 20, 2019 · 6e42b71 · 6e42b71
1 parent 1846765
commit 6e42b71
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HoneycombButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HoneycombButton.java
@@ -8,7 +8,6 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -33,6 +32,7 @@ public class HoneycombButton extends LinearLayout {
     private float mButtonTextSize;
     private String mSecondaryButtonText;
     private Drawable mButtonIcon;
+    private boolean mButtonIconHover;
 
     public HoneycombButton(Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, R.style.honeycombButtonTheme);
@@ -44,6 +44,7 @@ public HoneycombButton(Context context, @Nullable AttributeSet attrs, int defSty
         mButtonText = attributes.getString(R.styleable.HoneycombButton_honeycombButtonText);
         mButtonTextSize = attributes.getDimension(R.styleable.HoneycombButton_honeycombButtonTextSize, 0.0f);
         mButtonIcon = attributes.getDrawable(R.styleable.HoneycombButton_honeycombButtonIcon);
+        mButtonIconHover = attributes.getBoolean(R.styleable.HoneycombButton_honeycombButtonIconHover, true);
 
         String iconIdStr = attributes.getString(R.styleable.HoneycombButton_honeycombButtonIcon);
         int deviceTypeId = DeviceType.getType();
@@ -123,14 +124,18 @@ public void setOnHoverListener(final OnHoverListener l) {
             switch (motionEvent.getAction()) {
                 case MotionEvent.ACTION_HOVER_ENTER:
                     if (mIcon != null && mText != null) {
-                        mIcon.setColorFilter(new PorterDuffColorFilter(getResources().getColor(R.color.asphalt, getContext().getTheme()), PorterDuff.Mode.MULTIPLY));
+                        if (mButtonIconHover) {
+                            mIcon.setColorFilter(new PorterDuffColorFilter(getResources().getColor(R.color.asphalt, getContext().getTheme()), PorterDuff.Mode.MULTIPLY));
+                        }
                         mText.setTextColor(getContext().getColor(R.color.asphalt));
                         mSecondaryText.setTextColor(getContext().getColor(R.color.asphalt));
                     }
                     break;
                 case MotionEvent.ACTION_HOVER_EXIT:
                     if (mIcon != null && mText != null) {
-                        mIcon.setColorFilter(new PorterDuffColorFilter(getResources().getColor(R.color.fog, getContext().getTheme()), PorterDuff.Mode.MULTIPLY));
+                        if (mButtonIconHover) {
+                            mIcon.setColorFilter(new PorterDuffColorFilter(getResources().getColor(R.color.fog, getContext().getTheme()), PorterDuff.Mode.MULTIPLY));
+                        }
                         mText.setTextColor(getContext().getColor(R.color.fog));
                         mSecondaryText.setTextColor(getContext().getColor(R.color.fog));
                     }

diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
@@ -152,7 +152,8 @@
                             style="?attr/honeycombButtonStyle"
                             app:honeycombButtonIcon="@drawable/ic_icon_settings_account"
                             app:honeycombButtonText="@string/settings_fxa_account_sign_in"
-                            app:honeycombButtonTextSize="@dimen/settings_main_button_text_width" />
+                            app:honeycombButtonTextSize="@dimen/settings_main_button_text_width"
+                            app:honeycombButtonIconHover="false"/>
 
                     </LinearLayout>
 

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -7,6 +7,7 @@
         <attr name="honeycombButtonText" format="string" />
         <attr name="honeycombButtonTextSize" format="dimension" />
         <attr name="honeycombSecondaryText" format="string" />
+        <attr name="honeycombButtonIconHover" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="HoneycombSwitch">