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

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

Merge "resolve merge conflicts of 5e511e58 to master"

parents e10d173f 6037c697

packages/SystemUI/res/drawable/ic_dnd.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
    android:height="24dp"

    android:viewportHeight="48.0"

    android:viewportWidth="48.0"

    android:width="24dp" >

    android:width="24dp"

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



    <path

        android:fillColor="#FFFFFFFF"

packages/SystemUI/res/drawable/ic_dnd_total_silence.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:width="24dp" >

    android:width="24dp"

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



    <path

        android:fillColor="#FFFFFFFF"

packages/SystemUI/res/drawable/ic_invert_colors_enable.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
-->

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

    android:name="root"

    android:alpha="0.3"

    android:height="48dp"

    android:width="48dp"

    android:viewportHeight="48"

packages/SystemUI/res/drawable/ic_qs_signal_in.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project 
        android:width="6.0dp"

        android:height="32dp"

        android:viewportWidth="6.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M6.000000,15.700000l-3.000000,5.599999 -3.000000,-5.599999z"/>

packages/SystemUI/res/drawable/ic_qs_signal_out.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project 
        android:width="6.0dp"

        android:height="32dp"

        android:viewportWidth="6.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M0.000000,13.700000l3.000000,-5.700000 3.000000,5.700000z"/>