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

Commit f5afaffc authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Change notification alert icon" into qt-dev

am: 28214569

Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
parents 02c4e123 28214569
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
<!--
Copyright (C) 2019 The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M18 17v-6c0-3.07-1.63-5.64-4.5-6.32V4c0-0.83-0.67-1.5-1.5-1.5s-1.5 0.67 -1.5 1.5v0.68C7.64 5.36 6 7.92 6 11v6H4v2h16v-2h-2zm-2 0H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6zm-6 3h4c0 1.1-0.9 2-2 2s-2-0.9-2-2zm12-9h-2c0-2.74-1.23-5.19-3.16-6.84l1.41-1.41C20.54 4.77 22 7.71 22 11zM5.75 2.75l1.41 1.41C5.23 5.81 4 8.26 4 11H2c0-3.29 1.46-6.23 3.75-8.25z" />
</vector>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@
        android:focusable="true">
        <ImageView
            android:id="@+id/alert_icon"
            android:src="@drawable/ic_notifications"
            android:src="@drawable/ic_notifications_alert"
            android:background="@android:color/transparent"
            android:layout_gravity="center"
            android:layout_width="wrap_content"
+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
    }

    private Drawable getAlertingIcon() {
        Drawable icon = getContext().getDrawable(R.drawable.ic_notifications);
        Drawable icon = getContext().getDrawable(R.drawable.ic_notifications_alert);
        icon.setTintList(Utils.getColorAccent(getContext()));
        return icon;
    }