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

Commit aa745d6d authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "361454352-adaptiveIcon" into main 

* changes:
  Make RippleDrawable as the only background drawable to be borderless
  Enforce the gridview vertical spacing to be >= 0
parents 41f1a9f8 08a952fd

packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_assistant_24dp.xml→packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_assistant.xml

+2 −2
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="@color/colorControlNormal">

packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_brightness_down_24dp.xml→packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_brightness_down.xml

+2 −2
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="@color/colorControlNormal">

packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_brightness_up_24dp.xml→packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_brightness_up.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  -->



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

    android:width="24dp"

    android:height="24dp"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="@color/colorControlNormal">

packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_lock_24dp.xml→packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_lock.xml

+2 −2
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="@color/colorControlNormal">

packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_notifications_24dp.xml→packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_notifications.xml

+2 −2
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="@color/colorControlNormal">