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

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

Merge "NAS Settings Migration" into sc-dev

parents e781c3fb 3f03f514
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ interface INotificationManager
    List<ComponentName> getEnabledNotificationListeners(int userId);
    ComponentName getAllowedNotificationAssistantForUser(int userId);
    ComponentName getAllowedNotificationAssistant();
    ComponentName getDefaultNotificationAssistant();
    void resetDefaultNotificationAssistant(boolean loadFromConfig);
    boolean hasEnabledNotificationListener(String packageName, int userId);

    @UnsupportedAppUsage
+8 −0
Original line number Diff line number Diff line
@@ -9928,6 +9928,14 @@ public final class Settings {
        public static final String CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS =
                "clipboard_show_access_notifications";
        /**
         * If nonzero, nas has not been updated to reflect new changes.
         * @hide
         */
        @Readable
        public static final String NAS_SETTINGS_UPDATED = "nas_settings_updated";
        /**
         * These entries are considered common between the personal and the managed profile,
         * since the managed profile doesn't get to change them.
+6 −0
Original line number Diff line number Diff line
@@ -5982,6 +5982,12 @@
                  android:exported="false">
        </activity>

        <activity android:name="com.android.server.notification.NASLearnMoreActivity"
                  android:theme="@style/Theme.Dialog.Confirmation"
                  android:excludeFromRecents="true"
                  android:exported="false">
        </activity>

        <receiver android:name="com.android.server.BootReceiver"
                android:exported="true"
                android:systemUserOnly="true">
+15 −0
Original line number Diff line number Diff line
@@ -5513,6 +5513,21 @@
    <!-- 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>

    <!-- Notification Intelligence -->
    <!-- Title of notification indicating notification intelligence settings have changed when upgrading to S [CHAR LIMIT=30] -->
    <string name="nas_upgrade_notification_title">Try enhanced notifications</string>
    <!-- Content of notification indicating users need to update the settings [CHAR LIMIT=NONE] -->
    <string name="nas_upgrade_notification_content">To keep getting suggested actions, replies, and more, turn on enhanced notifications. Android Adaptive Notifications are no longer supported.</string>
    <!-- Label of notification action button to turn on the notification intelligence [CHAR LIMIT=20] -->
    <string name="nas_upgrade_notification_enable_action">Turn on</string>
    <!-- Label of notification action button to turn off the notification intelligence [CHAR LIMIT=20] -->
    <string name="nas_upgrade_notification_disable_action">Not now</string>
    <!-- Label of notification action button to learn more about the notification intelligence settings [CHAR LIMIT=20] -->
    <string name="nas_upgrade_notification_learn_more_action">Learn more</string>
    <!-- Content of notification learn more dialog about the notification intelligence settings [CHAR LIMIT=NONE] -->
    <string name="nas_upgrade_notification_learn_more_content">Enhanced notifications can read all notification content, including personal information like contact names and messages. This feature can also dismiss notifications or take actions on buttons in notifications, such as answering phone calls.\n\nThis feature can also turn Priority mode on or off and change related settings.</string>


    <!-- Dynamic mode battery saver strings -->
    <!-- The user visible name of the notification channel for the routine mode battery saver fyi notification [CHAR_LIMIT=80]-->
    <string name="dynamic_mode_notification_channel_name">Routine Mode info notification</string>
+6 −0
Original line number Diff line number Diff line
@@ -2263,6 +2263,12 @@
  <java-symbol type="style" name="Animation.RecentApplications" />
  <java-symbol type="integer" name="dock_enter_exit_duration" />
  <java-symbol type="bool" name="config_battery_percentage_setting_available" />
  <java-symbol type="string" name="nas_upgrade_notification_title" />
  <java-symbol type="string" name="nas_upgrade_notification_content" />
  <java-symbol type="string" name="nas_upgrade_notification_enable_action" />
  <java-symbol type="string" name="nas_upgrade_notification_disable_action" />
  <java-symbol type="string" name="nas_upgrade_notification_learn_more_action" />
  <java-symbol type="string" name="nas_upgrade_notification_learn_more_content" />

  <!-- ImfTest -->
  <java-symbol type="layout" name="auto_complete_list" />
Loading