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

Commit 5971d553 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Inline settings color changes."

parents beda5390 7727ad23

core/res/res/drawable/ic_notification_alert.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -20,14 +20,14 @@ Copyright (C) 2016 The Android Open Source Project 
        android:viewportHeight="24.0">

        android:viewportHeight="24.0">

    <path

    <path

        android:pathData="M18.4,2.2L17.0,3.6c2.0,1.4 3.3,3.7 3.5,6.4l2.0,0.0C22.3,6.8 20.8,4.0 18.4,2.2z"

        android:pathData="M18.4,2.2L17.0,3.6c2.0,1.4 3.3,3.7 3.5,6.4l2.0,0.0C22.3,6.8 20.8,4.0 18.4,2.2z"

        android:fillColor="#231F20"/>

        android:fillColor="#FFFFFFFF"/>

    <path

    <path

        android:pathData="M7.1,3.6L5.7,2.2C3.3,4.0 1.7,6.8 1.5,10.0l2.0,0.0C3.7,7.3 5.0,5.0 7.1,3.6z"

        android:pathData="M7.1,3.6L5.7,2.2C3.3,4.0 1.7,6.8 1.5,10.0l2.0,0.0C3.7,7.3 5.0,5.0 7.1,3.6z"

        android:fillColor="#231F20"/>

        android:fillColor="#FFFFFFFF"/>

    <path

    <path

        android:pathData="M18.5,10.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.5,3.5C13.5,2.7 12.8,2.0 12.0,2.0s-1.5,0.7 -1.5,1.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.5,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0l-2.0,-2.0L18.5,10.5zM13.0,16.5l-2.0,0.0l0.0,-2.0l2.0,0.0L13.0,16.5zM13.0,12.5l-2.0,0.0l0.0,-6.0l2.0,0.0L13.0,12.5z"

        android:pathData="M18.5,10.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.5,3.5C13.5,2.7 12.8,2.0 12.0,2.0s-1.5,0.7 -1.5,1.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.5,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0l-2.0,-2.0L18.5,10.5zM13.0,16.5l-2.0,0.0l0.0,-2.0l2.0,0.0L13.0,16.5zM13.0,12.5l-2.0,0.0l0.0,-6.0l2.0,0.0L13.0,12.5z"

        android:fillColor="#231F20"/>

        android:fillColor="#FFFFFFFF"/>

    <path

    <path

        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0L10.0,20.0C10.0,21.1 10.9,22.0 12.0,22.0z"

        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0L10.0,20.0C10.0,21.1 10.9,22.0 12.0,22.0z"

        android:fillColor="#231F20"/>

        android:fillColor="#FFFFFFFF"/>

</vector>
 
</vector>

core/res/res/drawable/ic_notification_block.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,6 @@ Copyright (C) 2016 The Android Open Source Project 
        android:viewportHeight="24.0">

        android:viewportHeight="24.0">





    <path

    <path

        android:fillColor="#FF000000"

        android:fillColor="#FFFFFFFF"

        android:pathData="M12.0,2.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zM4.0,12.0c0.0,-4.42 3.58,-8.0 8.0,-8.0 1.85,0.0 3.5,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4.0,13.85 4.0,12.0zm8.0,8.0c-1.85,0.0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20.0,10.15 20.0,12.0c0.0,4.42 -3.58,8.0 -8.0,8.0z"/>

        android:pathData="M12.0,2.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zM4.0,12.0c0.0,-4.42 3.58,-8.0 8.0,-8.0 1.85,0.0 3.5,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4.0,13.85 4.0,12.0zm8.0,8.0c-1.85,0.0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20.0,10.15 20.0,12.0c0.0,4.42 -3.58,8.0 -8.0,8.0z"/>

</vector>
 
</vector>

packages/SystemUI/res/layout/notification_guts.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -99,7 +99,8 @@ 
                    android:src="@*android:drawable/ic_notification_block"

                    android:src="@*android:drawable/ic_notification_block"

                    android:layout_gravity="center_vertical|start"

                    android:layout_gravity="center_vertical|start"

                    android:layout_width="24dp"

                    android:layout_width="24dp"

                    android:layout_height="24dp" />

                    android:layout_height="24dp"

                    android:tint="@color/notification_guts_icon_tint"/>





            <SeekBar

            <SeekBar

                    android:id="@+id/seekbar"

                    android:id="@+id/seekbar"
@@ -121,7 +122,8 @@ 
                    android:src="@*android:drawable/ic_notification_alert"

                    android:src="@*android:drawable/ic_notification_alert"

                    android:layout_gravity="center_vertical|end"

                    android:layout_gravity="center_vertical|end"

                    android:layout_width="24dp"

                    android:layout_width="24dp"

                    android:layout_height="24dp"/>

                    android:layout_height="24dp"

                    android:tint="@color/notification_guts_icon_tint" />





        </FrameLayout>

        </FrameLayout>

packages/SystemUI/res/values/colors.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -100,9 +100,11 @@ 
    <color name="current_user_border_color">@color/system_accent_color</color>

    <color name="current_user_border_color">@color/system_accent_color</color>





    <!-- The "inside" of a notification, reached via longpress -->

    <!-- The "inside" of a notification, reached via longpress -->

    <color name="notification_guts_bg_color">@*android:color/material_grey_50</color>

    <color name="notification_guts_bg_color">#eeeeee</color>

    <color name="notification_guts_slider_color">@*android:color/material_deep_teal_500</color>

    <color name="notification_guts_slider_color">@*android:color/material_deep_teal_500</color>

    <color name="notification_guts_secondary_slider_color">#858383</color>

    <color name="notification_guts_secondary_slider_color">#858383</color>

    <color name="notification_guts_icon_tint">#8a000000</color>

    <color name="notification_guts_disabled_icon_tint">#4d000000</color>





    <color name="assist_orb_color">#ffffff</color>

    <color name="assist_orb_color">#ffffff</color>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ import android.service.notification.NotificationListenerService; 
import android.service.notification.StatusBarNotification;

import android.service.notification.StatusBarNotification;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.View;

import android.view.View;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.LinearLayout;

import android.widget.RadioButton;

import android.widget.RadioButton;

import android.widget.SeekBar;

import android.widget.SeekBar;
@@ -133,6 +134,10 @@ public class NotificationGuts extends LinearLayout { 
        } catch (PackageManager.NameNotFoundException e) {

        } catch (PackageManager.NameNotFoundException e) {

            // unlikely.

            // unlikely.

        }

        }

        if (systemApp) {

            ((ImageView) row.findViewById(R.id.low_importance)).getDrawable().setTint(

                    mContext.getColor(R.color.notification_guts_disabled_icon_tint));

        }

        final int minProgress = systemApp ?

        final int minProgress = systemApp ?

                NotificationListenerService.Ranking.IMPORTANCE_LOW

                NotificationListenerService.Ranking.IMPORTANCE_LOW

                : NotificationListenerService.Ranking.IMPORTANCE_NONE;

                : NotificationListenerService.Ranking.IMPORTANCE_NONE;