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

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

Merge "Differentiate between apps that use topics and those that don't."

parents db3631f8 be8fdee5
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ interface INotificationManager
    void setTopicImportance(String pkg, int uid, in Notification.Topic topic, int importance);
    int getTopicImportance(String pkg, int uid, in Notification.Topic topic);
    void setAppImportance(String pkg, int uid, int importance);
    boolean doesAppUseTopics(String pkg, int uid);

    // TODO: Remove this when callers have been migrated to the equivalent
    // INotificationListener method.
+0 −19
Original line number Diff line number Diff line
@@ -3966,25 +3966,6 @@
    <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
    <string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration, location services, and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging.</string>


    <!-- [CHAR LIMIT=100] Notification importance slider title -->
    <string name="notification_importance_title">Importance</string>

    <!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
    <string name="notification_importance_blocked">Blocked: Never show these notifications</string>

    <!-- [CHAR LIMIT=100] Notification Importance slider: low importance level description -->
    <string name="notification_importance_low">Low: Silently show at the bottom of the notification list</string>

    <!-- [CHAR LIMIT=100] Notification Importance slider: normal importance level description -->
    <string name="notification_importance_default">Normal: Silently show these notifications</string>

    <!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description -->
    <string name="notification_importance_high">High: Show at the top of the notifications list and make sound</string>

    <!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
    <string name="notification_importance_max">Urgent: Peek onto the screen and make sound</string>

    <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
    <plurals name="zen_mode_duration_minutes_summary">
        <item quantity="one">For one minute (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+0 −6
Original line number Diff line number Diff line
@@ -2091,12 +2091,6 @@
  <java-symbol type="array" name="config_system_condition_providers" />
  <java-symbol type="string" name="muted_by" />
  <java-symbol type="string" name="zen_mode_alarm" />
  <java-symbol type="string" name="notification_importance_blocked" />
  <java-symbol type="string" name="notification_importance_low" />
  <java-symbol type="string" name="notification_importance_default" />
  <java-symbol type="string" name="notification_importance_high" />
  <java-symbol type="string" name="notification_importance_max" />
  <java-symbol type="string" name="notification_importance_title" />

  <java-symbol type="string" name="select_day" />
  <java-symbol type="string" name="select_year" />
+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@
    <!-- Adding Quick Settings tiles -->
    <uses-permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE" />

    <!-- Block notifications inline notifications -->
    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />

    <application
        android:name=".SystemUIApplication"
        android:persistent="true"
+3 −1
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@

        </FrameLayout>

        <RadioGroup android:layout_width="wrap_content"
        <RadioGroup
                    android:id="@+id/apply_to"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:paddingTop="8dp">
            <RadioButton android:id="@+id/apply_to_topic"
Loading