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

Commit d0363bc3 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android Git Automerger
Browse files

am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 

* commit '5793f22e':
  Use theme attributes for FloatingToolbar colors.
parents cf9f16d2 5793f22e

core/res/res/layout/floating_popup_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ 
    android:elevation="2dp"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:background="@color/floating_toolbar_background_color"/>
 
    android:background="?attr/colorBackgroundFloating"/>

core/res/res/layout/floating_popup_menu_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ 
    android:fontFamily="sans-serif"

    android:textSize="@dimen/floating_toolbar_text_size"

    android:textAllCaps="true"

    android:textColor="@color/floating_toolbar_text_color"

    android:textColor="?attr/colorForeground"

    android:background="?attr/selectableItemBackground" />

core/res/res/layout/floating_popup_overflow_list_item

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ 
    android:ellipsize="end"

    android:fontFamily="sans-serif"

    android:textSize="@dimen/floating_toolbar_text_size"

    android:textColor="@color/floating_toolbar_text_color"

    android:textColor="?attr/colorForeground"

    android:textAllCaps="true" />

core/res/res/values/colors.xml

+0 −4
Original line number Diff line number Diff line
@@ -174,8 +174,4 @@ 
    <color name="Pink_800">#ffad1457</color>

    <color name="Red_700">#ffc53929</color>

    <color name="Red_800">#ffb93221</color>



    <!-- Floating toolbar colors -->

    <color name="floating_toolbar_text_color">#DD000000</color>

    <color name="floating_toolbar_background_color">#FAFAFA</color>

</resources>