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

Commit 718b40dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Media TTT] Tweak the coloring and sizing of the receiver icon." into...

Merge "[Media TTT] Tweak the coloring and sizing of the receiver icon." into tm-qpr-dev am: 49c7dad1 am: 3ede8ab4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20816006



Change-Id: Id2559843fd2e416a35ec1b115f0bf212e536aff2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ab6f7c7 3ede8ab4
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:shape="oval">
    <size
        android:height="@dimen/media_ttt_chip_size_receiver"
        android:width="@dimen/media_ttt_chip_size_receiver"
        android:height="@dimen/media_ttt_icon_size_receiver"
        android:width="@dimen/media_ttt_icon_size_receiver"
        />
    <solid android:color="?androidprv:attr/colorSurface" />
    <solid android:color="?androidprv:attr/colorAccentPrimary" />
</shape>
+5 −4
Original line number Diff line number Diff line
@@ -1077,11 +1077,12 @@
    <dimen name="media_ttt_last_item_start_margin">12dp</dimen>

    <!-- Media tap-to-transfer chip for receiver device -->
    <dimen name="media_ttt_chip_size_receiver">100dp</dimen>
    <dimen name="media_ttt_icon_size_receiver">95dp</dimen>
    <dimen name="media_ttt_icon_size_receiver">112dp</dimen>
    <!-- Add some padding for the generic icon so it doesn't go all the way to the border. -->
    <dimen name="media_ttt_generic_icon_padding">12dp</dimen>
    <dimen name="media_ttt_receiver_vert_translation">20dp</dimen>
    <!-- The generic icon should be 40dp, and the full icon is 112dp, so the padding should be
         (112 - 40) / 2 = 36dp -->
    <dimen name="media_ttt_generic_icon_padding">36dp</dimen>
    <dimen name="media_ttt_receiver_vert_translation">40dp</dimen>

    <!-- Window magnification -->
    <dimen name="magnification_border_drag_size">35dp</dimen>