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

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

Merge "Update music, notifications, device information, and movies icons" into pi-dev

parents c9d258a1 32acddc8

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ 
        <activity

            android:name="Settings$ZenModeSettingsActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_settings_notifications"

            android:icon="@drawable/ic_notifications"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">
@@ -762,7 +762,7 @@ 
        <activity

            android:name=".notification.ZenOnboardingActivity"

            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"

            android:icon="@drawable/ic_settings_notifications"

            android:icon="@drawable/ic_notifications"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

            android:exported="true"

            android:taskAffinity="com.android.settings"
@@ -775,7 +775,7 @@ 
        <activity

            android:name="Settings$ZenModeAutomationSettingsActivity"

            android:label="@string/zen_mode_automation_settings_title"

            android:icon="@drawable/ic_settings_notifications"

            android:icon="@drawable/ic_notifications"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings$ZenModeSettingsActivity">

res/drawable/ic_local_movies.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M18,3v2h-2V3H8v2H6V3H5C4.45,3 4,3.45 4,4v16c0,0.55 0.45,1 1,1h1v-2h2v2h8v-2h2v2h1c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1H18zM8,17H6v-2h2V17zM8,13H6v-2h2V13zM8,9H6V7h2V9zM18,17h-2v-2h2V17zM18,13h-2v-2h2V13zM18,9h-2V7h2V9z"/>

        android:pathData="M20,4h-3l2,4h-3l-2,-4h-2l2,4h-3L9,4H7l2,4H6L4,4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18L4,18v-8h16V18z"/>

</vector>

res/drawable/ic_media_stream.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/>

        android:pathData="M12,3l0.01,10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55C7.79,13 6,14.79 6,17c0,2.21 1.79,4 4.01,4S14,19.21 14,17V7h4V3H12zM10.01,19c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C12.01,18.1 11.11,19 10.01,19z"/>

</vector>

res/drawable/ic_notifications.xml

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
        android:viewportHeight="24.0"

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

    <path

        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"

        android:fillColor="#FFFFFFFF"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>

</vector>

res/drawable/ic_perm_device_information_green_24dp.xml

+7 −2
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#0F9D58"

        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,

        1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>

        android:pathData="M11,7h2v2h-2z"/>

    <path

        android:fillColor="#0F9D58"

        android:pathData="M11,11h2v6h-2z"/>

    <path

        android:fillColor="#0F9D58"

        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>

</vector>