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

Commit f480dbb6 authored by Chloris Kuo's avatar Chloris Kuo Committed by Android (Google) Code Review
Browse files

Merge changes from topic "Feedback UI" 

* changes:
  Feedback Inline Setting change
  Feedback UI Improvement 1. Show different icon for different NAS adjustments 2. Fix style issues in dark theme and new S notification UI change
parents 8047aec1 49251b67

core/java/android/app/Notification.java

+0 −6
Original line number Diff line number Diff line
@@ -5163,16 +5163,10 @@ public class Notification implements Parcelable 
            bindHeaderChronometerAndTime(contentView, p, hasTextToLeft);

            bindProfileBadge(contentView, p);

            bindAlertedIcon(contentView, p);

            bindFeedbackIcon(contentView, p);

            bindExpandButton(contentView, p);

            mN.mUsesStandardHeader = true;

        }



        private void bindFeedbackIcon(RemoteViews contentView, StandardTemplateParams p) {

            int color = getNeutralColor(p);

            contentView.setDrawableTint(R.id.feedback, false, color, PorterDuff.Mode.SRC_ATOP);

        }



        private void bindExpandButton(RemoteViews contentView, StandardTemplateParams p) {

            int color = isColorized(p) ? getPrimaryTextColor(p) : getSecondaryTextColor(p);

            contentView.setDrawableTint(R.id.expand_button, false, color,

core/res/res/drawable/ic_feedback_alerted.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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="16dp"

        android:height="16dp"

        android:viewportWidth="16"

        android:viewportHeight="16">

    <path

        android:pathData="M3.3333,5.6667H6V9.6667H10V5.6667H12.6667L8,1L3.3333,5.6667Z"

        android:fillColor="#EA4335"/>

    <path

        android:strokeWidth="1"

        android:pathData="M2.9798,8.9798L2.1262,9.8333H3.3333H5.5V13.3333V13.8333H6H10H10.5V13.3333V9.8333H12.6667H13.8738L13.0202,8.9798L8.3536,4.3131L8,3.9596L7.6465,4.3131L2.9798,8.9798Z"

        android:fillColor="#EA4335"

        android:strokeColor="#ffffff"/>

</vector>

core/res/res/drawable/ic_feedback_downrank.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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="16dp"

        android:height="16dp"

        android:viewportWidth="16"

        android:viewportHeight="16">

    <path

        android:pathData="M12.6667,8H10V4H6V8H3.3333L8,12.6667L12.6667,8Z"

        android:fillColor="#4285F4"/>

</vector>

core/res/res/drawable/ic_feedback_silenced.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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="16dp"

        android:height="16dp"

        android:viewportWidth="16"

        android:viewportHeight="16">

    <group>

        <clip-path

            android:pathData="M16,16l-16,-0l-0,-16l16,-0z"/>

        <path

            android:pathData="M12.6667,10.3333H10V6.3333H6V10.3333H3.3333L8,15L12.6667,10.3333Z"

            android:fillColor="#4285F4"/>

        <path

            android:strokeWidth="1"

            android:pathData="M13.0202,7.0202L13.8738,6.1667H12.6667H10.5V2.6667L10.5,2.1667H10H6H5.5V2.6667V6.1667H3.3333H2.1262L2.9798,7.0202L7.6464,11.6869L8,12.0405L8.3535,11.6869L13.0202,7.0202Z"

            android:fillColor="#4285F4"

            android:strokeColor="#ffffff"/>

    </group>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_feedback_uprank.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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="16dp"

        android:height="16dp"

        android:viewportWidth="16"

        android:viewportHeight="16">

    <path

        android:pathData="M3.3333,8H6V12H10V8H12.6667L8,3.3333L3.3333,8Z"

        android:fillColor="#EA4335"/>

</vector>