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

Commit b3a23775 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Home Controls] Fix sizing and color of chevron." into tm-dev am: 8f083530 

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



Change-Id: I843138ca8f3854e87b7aae2d33ccb003fa2647cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b08b8a6 8f083530

packages/SystemUI/res/drawable/ic_chevron_icon.xml

+3 −11
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ 
  ~ limitations under the License.

  -->



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

    android:width="18dp"

    android:height="31dp"

    android:viewportWidth="18"

    android:viewportHeight="31">

  <path

      android:pathData="M0.0061,27.8986L2.6906,30.5831L17.9219,15.3518L2.6906,0.1206L0.0061,2.8051L12.5338,15.3518"

      android:strokeAlpha="0.7"

      android:fillColor="#FFFFFF"

      android:fillAlpha="0.7"/>

<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M9.4,18 L8,16.6 12.6,12 8,7.4 9.4,6 15.4,12Z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

+5 −3
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ class ControlViewHolder( 
        updateContentDescription()



        status.setTextColor(color)

        chevronIcon.imageTintList = color



        control?.getCustomIcon()?.let {

            icon.setImageIcon(it)
@@ -495,10 +494,13 @@ class ControlViewHolder( 
                icon.imageTintList = color

            }

        }



        chevronIcon.imageTintList = icon.imageTintList

    }



    private fun setEnabled(enabled: Boolean) {

        status.setEnabled(enabled)

        icon.setEnabled(enabled)

        status.isEnabled = enabled

        icon.isEnabled = enabled

        chevronIcon.isEnabled = enabled

    }

}