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

Commit 9ce9dd84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update Settings overlayed icons."

parents 9b1cf314 5d8b1b3c

res/drawable/ic_arrow_down_24dp.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:tint="?android:attr/colorControlNormal"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@android:color/white"

        android:pathData="M12,16.41l-6.71,-6.7l1.42,-1.42l5.29,5.3l5.29,-5.3l1.42,1.42z"/>

</vector>

res/drawable/ic_content_copy_grey600_24dp.xml

+2 −1
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:tint="@*android:color/material_grey_600"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"

      android:fillColor="#757575"/>

      android:fillColor="@android:color/white"/>

</vector>

res/drawable/ic_devices_other_32dp.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="32dp"

    android:height="32dp"

    android:tint="?android:attr/colorAccent"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorAccent">

    android:viewportHeight="24">

  <path

      android:fillColor="#FF000000"

      android:fillColor="@android:color/white"

      android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22 0,0.89 0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>

</vector>

res/drawable/ic_friction_lock_closed.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:tint="?android:attr/colorControlNormal"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@android:color/white"

        android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>

</vector>

tests/robotests/res/values/overlayable_icons_test.xml

+4 −4
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
    <item>@drawable/ic_arrow_back</item>

    <item>@drawable/ic_arrow_down_24dp</item>

    <item>@drawable/ic_battery_charging_full</item>

    <item>@drawable/ic_battery_saver_accent_24dp</item>

    <item>@drawable/ic_battery_status_bad_24dp</item>

    <item>@drawable/ic_battery_status_good_24dp</item>

    <item>@drawable/ic_battery_status_maybe_24dp</item>

    <item>@drawable/ic_call_24dp</item>
@@ -38,13 +36,13 @@ 
    <item>@drawable/ic_content_copy_grey600_24dp</item>

    <item>@drawable/ic_data_saver</item>

    <item>@drawable/ic_delete</item>

    <item>@drawable/ic_delete_accent</item>

    <item>@drawable/ic_devices_other</item>

    <item>@drawable/ic_devices_other_32dp</item>

    <item>@drawable/ic_do_not_disturb_on_24dp</item>

    <item>@drawable/ic_eject_24dp</item>

    <item>@drawable/ic_expand_less</item>

    <item>@drawable/ic_expand_more_inverse</item>

    <item>@drawable/ic_find_in_page_24px</item>

    <item>@drawable/ic_folder_vd_theme_24</item>

    <item>@drawable/ic_friction_lock_closed</item>

    <item>@drawable/ic_gray_scale_24dp</item>
@@ -73,7 +71,9 @@ 
    <item>@drawable/ic_settings_delete</item>

    <item>@drawable/ic_settings_display_white</item>

    <item>@drawable/ic_settings_home</item>

    <item>@drawable/ic_settings_language</item>

    <item>@drawable/ic_settings_location</item>

    <item>@drawable/ic_settings_multiuser</item>

    <item>@drawable/ic_settings_night_display</item>

    <item>@drawable/ic_settings_open</item>

    <item>@drawable/ic_settings_print</item>
@@ -82,7 +82,6 @@ 
    <item>@drawable/ic_settings_sim</item>

    <item>@drawable/ic_settings_system_dashboard_white</item>

    <item>@drawable/ic_settings_wireless</item>

    <item>@drawable/ic_settings_wireless_white</item>

    <item>@drawable/ic_storage</item>

    <item>@drawable/ic_storage_white</item>

    <item>@drawable/ic_suggestion_night_display</item>
@@ -92,5 +91,6 @@ 
    <item>@drawable/ic_volume_ringer_vibrate</item>

    <item>@drawable/ic_volume_up_24dp</item>

    <item>@drawable/ic_vpn_key</item>

    <item>@drawable/ic_wifi_tethering</item>

  </array>

</resources>