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

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

Merge "[A11y] Notification Intelligence Feedback UI"

parents 0b54fc0d 975d47e1

core/res/res/layout/notification_top_line_views.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -112,11 +112,12 @@ 
        android:id="@+id/feedback"

        android:id="@+id/feedback"

        android:layout_width="@dimen/notification_feedback_size"

        android:layout_width="@dimen/notification_feedback_size"

        android:layout_height="@dimen/notification_feedback_size"

        android:layout_height="@dimen/notification_feedback_size"

        android:layout_marginStart="4dp"

        android:layout_marginStart="@dimen/notification_header_separating_margin"

        android:layout_marginEnd="4dp"

        android:layout_gravity="center"

        android:scaleType="fitCenter"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_feedback_indicator"

        android:src="@drawable/ic_feedback_indicator"

        android:background="?android:selectableItemBackgroundBorderless"

        android:background="?android:selectableItemBackgroundBorderless"

        android:paddingTop="2dp"

        android:visibility="gone"

        android:visibility="gone"

        android:contentDescription="@string/notification_feedback_indicator"

        android:contentDescription="@string/notification_feedback_indicator"

        />

        />

core/res/res/values/dimens.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -480,7 +480,7 @@ 
    <dimen name="notification_inbox_item_top_padding">5dp</dimen>

    <dimen name="notification_inbox_item_top_padding">5dp</dimen>





    <!-- Size of the feedback indicator for notifications -->

    <!-- Size of the feedback indicator for notifications -->

    <dimen name="notification_feedback_size">16dp</dimen>

    <dimen name="notification_feedback_size">20dp</dimen>





    <!-- Size of the profile badge for notifications -->

    <!-- Size of the profile badge for notifications -->

    <dimen name="notification_badge_size">12dp</dimen>

    <dimen name="notification_badge_size">12dp</dimen>

core/res/res/values/strings.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -5366,6 +5366,14 @@ 
    <!-- Feedback Indicator -->

    <!-- Feedback Indicator -->

    <!-- Content description of the feedback icon in the notification. [CHAR LIMIT=NONE] -->

    <!-- Content description of the feedback icon in the notification. [CHAR LIMIT=NONE] -->

    <string name="notification_feedback_indicator">Provide Feedback</string>

    <string name="notification_feedback_indicator">Provide Feedback</string>

    <!-- Content description of the alerted feedback icon in the notification. [CHAR LIMIT=NONE] -->

    <string name="notification_feedback_indicator_alerted">This notification was promoted to Default. Tap to provide feedback.</string>

    <!-- Content description of the silenced feedback icon in the notification. [CHAR LIMIT=NONE] -->

    <string name="notification_feedback_indicator_silenced">This notification was demoted to Silent. Tap to provide feedback.</string>

    <!-- Content description of the promoted feedback icon in the notification. [CHAR LIMIT=NONE] -->

    <string name="notification_feedback_indicator_promoted">This notification was ranked higher. Tap to provide feedback.</string>

    <!-- Content description of the demoted feedback icon in the notification. [CHAR LIMIT=NONE] -->

    <string name="notification_feedback_indicator_demoted">This notification was ranked lower. Tap to provide feedback.</string>





    <!-- Dynamic mode battery saver strings -->

    <!-- Dynamic mode battery saver strings -->

    <!-- The user visible name of the notification channel for the routine mode battery saver fyi notification [CHAR_LIMIT=80]-->

    <!-- The user visible name of the notification channel for the routine mode battery saver fyi notification [CHAR_LIMIT=80]-->

core/res/res/values/symbols.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -2252,6 +2252,10 @@ 
  <java-symbol type="string" name="ext_media_move_success_message" />

  <java-symbol type="string" name="ext_media_move_success_message" />

  <java-symbol type="string" name="ext_media_move_failure_title" />

  <java-symbol type="string" name="ext_media_move_failure_title" />

  <java-symbol type="string" name="ext_media_move_failure_message" />

  <java-symbol type="string" name="ext_media_move_failure_message" />

  <java-symbol type="string" name="notification_feedback_indicator_alerted" />

  <java-symbol type="string" name="notification_feedback_indicator_silenced" />

  <java-symbol type="string" name="notification_feedback_indicator_promoted" />

  <java-symbol type="string" name="notification_feedback_indicator_demoted" />

  <java-symbol type="style" name="Animation.RecentApplications" />

  <java-symbol type="style" name="Animation.RecentApplications" />

  <java-symbol type="integer" name="dock_enter_exit_duration" />

  <java-symbol type="integer" name="dock_enter_exit_duration" />

  <java-symbol type="bool" name="config_battery_percentage_setting_available" />

  <java-symbol type="bool" name="config_battery_percentage_setting_available" />

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -485,7 +485,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
                }

                }

            }

            }

            row.showFeedbackIcon(mAssistantFeedbackController.showFeedbackIndicator(entry),

            row.showFeedbackIcon(mAssistantFeedbackController.showFeedbackIndicator(entry),

                    mAssistantFeedbackController.getFeedbackImageResource(entry));

                    mAssistantFeedbackController.getFeedbackResources(entry));

            row.setLastAudiblyAlertedMs(entry.getLastAudiblyAlertedMs());

            row.setLastAudiblyAlertedMs(entry.getLastAudiblyAlertedMs());

        }

        }