Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f43b32f1 authored by Andrew Lee's avatar Andrew Lee
Browse files

Tweak FAB tints and positioning. 

+ Change FAB tint so that it's not 100% opacity.
+ Change dialpad touch tints to new theme color.
- Don't translate FAB downwards when opening dialpad.

Bug: 16399233
Change-Id: I7d5e0015e0d7d436ce3e2780f3048dfb792d13c0
parent e4ea104a

res/drawable/floating_action_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="@color/dialer_accent_color">

    android:color="@color/floating_action_button_touch_tint">

    <item android:drawable="@drawable/fab_blue" />

</ripple>

res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    <color name="dialtacts_primary_text_color">#333</color>

    <!-- Secondary text color in the Dialer -->

    <color name="dialtacts_secondary_text_color">#737373</color>

    <color name="dialer_accent_color">#eeff41</color>

    <color name="dialer_red_highlight_color">#ff1744</color>

    <color name="dialer_green_highlight_color">#00c853</color>
@@ -100,7 +99,8 @@ 
    <!-- Color for icons in the actionbar -->

    <color name="actionbar_icon_color">#ffffff</color>



    <color name="dialer_dialpad_touch_tint">#331dc7db</color>

    <color name="dialer_dialpad_touch_tint">#330288d1</color>



    <color name="floating_action_button_touch_tint">#80ffffff</color>



</resources>

src/com/android/dialer/DialtactsActivity.java

+1 −10
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
    private String mActionMenuDialpadButtonStr;

    private ImageButton mFloatingActionButton;

    private FloatingActionButtonController mFloatingActionButtonController;

    /**

     * Additional offset for FAB to be lowered when dialpad is open.

     */

    private int mFloatingActionButtonDialpadMarginBottomOffset;



    private int mActionBarHeight;
@@ -393,8 +389,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
        mFloatingActionButton.setOnTouchListener(this);

        mFloatingActionButtonController = new FloatingActionButtonController(this,

                floatingActionButtonContainer);

        mFloatingActionButtonDialpadMarginBottomOffset = resources.getDimensionPixelOffset(

                R.dimen.floating_action_button_dialpad_margin_bottom_offset);



        ImageButton optionsMenuButton =

                (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button);
@@ -1207,9 +1201,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
                align = FloatingActionButtonController.ALIGN_END;

            }

        }

        mFloatingActionButtonController.align(align,

                0 /* offsetX */,

                mIsDialpadShown ? mFloatingActionButtonDialpadMarginBottomOffset : 0 /* offsetY */,

                animate);

        mFloatingActionButtonController.align(align, 0 /* offsetX */, 0 /* offsetY */, animate);

    }

}