summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAlex Mang <alexmang@google.com>2020-08-03 17:23:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-08-03 17:23:04 +0000
commit570fc4b20af81c7a99808fcf07655fd739e4887d (patch)
treec4c7ad2b227ff7f4e6a1e4fd4981632aab8d18b5 /core/java/android
parent512a6b3089563fd4e3ae34aac128d70afae7fd8f (diff)
parent9b421ee9dad252456e092121092eff5760f72c38 (diff)
Merge "Cache Feedback Enabled Setting in Controller"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 7ee41b9fe418..5acc11a868bf 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8728,16 +8728,6 @@ public final class Settings {
= "bubble_important_conversations";
/**
- * When enabled, notifications the notification assistant service has modified will show an
- * indicator. When tapped, this indicator will describe the adjustment made and solicit
- * feedback. This flag will also add a "automatic" option to the long press menu.
- *
- * The value 1 - enable, 0 - disable
- * @hide
- */
- public static final String NOTIFICATION_FEEDBACK_ENABLED = "notification_feedback_enabled";
-
- /**
* Whether notifications are dismissed by a right-to-left swipe (instead of a left-to-right
* swipe).
*
@@ -14047,6 +14037,16 @@ public final class Settings {
"notification_snooze_options";
/**
+ * When enabled, notifications the notification assistant service has modified will show an
+ * indicator. When tapped, this indicator will describe the adjustment made and solicit
+ * feedback. This flag will also add a "automatic" option to the long press menu.
+ *
+ * The value 1 - enable, 0 - disable
+ * @hide
+ */
+ public static final String NOTIFICATION_FEEDBACK_ENABLED = "notification_feedback_enabled";
+
+ /**
* Settings key for the ratio of notification dismissals to notification views - one of the
* criteria for showing the notification blocking helper.
*