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

Commit ee27499b authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Android (Google) Code Review
Browse files

Merge "Add aconfig flags polite notifications refinements" into main

parents 26a4d08b a08bd968

packages/SystemUI/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ android_library { 
        "lottie",

        "LowLightDreamLib",

        "motion_tool_lib",

        "notification_flags_lib",

    ],

    libs: [

        "keepanno-annotations",
@@ -328,6 +329,7 @@ android_library { 
        "androidx.compose.ui_ui",

        "flag-junit",

        "platform-test-annotations",

        "notification_flags_lib",

    ],

}

packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.systemui.flags



import com.android.server.notification.Flags.FLAG_CROSS_APP_POLITE_NOTIFICATIONS

import com.android.server.notification.Flags.FLAG_POLITE_NOTIFICATIONS

import com.android.server.notification.Flags.FLAG_VIBRATE_WHILE_UNLOCKED

import com.android.server.notification.Flags.crossAppPoliteNotifications

import com.android.server.notification.Flags.politeNotifications

import com.android.server.notification.Flags.vibrateWhileUnlocked

import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.dagger.SysUISingleton
@@ -36,5 +42,14 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        val keyguardBottomAreaRefactor = FlagToken(

                FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor())

        KeyguardShadeMigrationNssl.token dependsOn keyguardBottomAreaRefactor



        val crossAppPoliteNotifToken =

                FlagToken(FLAG_CROSS_APP_POLITE_NOTIFICATIONS, crossAppPoliteNotifications())

        val politeNotifToken = FlagToken(FLAG_POLITE_NOTIFICATIONS, politeNotifications())

        crossAppPoliteNotifToken dependsOn politeNotifToken



        val vibrateWhileUnlockedToken =

                FlagToken(FLAG_VIBRATE_WHILE_UNLOCKED, vibrateWhileUnlocked())

        vibrateWhileUnlockedToken dependsOn politeNotifToken

    }

}

services/core/java/com/android/server/notification/flags.aconfig

+14 −0
Original line number Diff line number Diff line
@@ -20,3 +20,17 @@ flag { 
  description: "This flag controls the refactoring of NMS to NotificationAttentionHelper"

  bug: "291907312"

}



flag {

  name: "cross_app_polite_notifications"

  namespace: "systemui"

  description: "This flag controls the cross-app effect of polite notifications"

  bug: "270456865"

}



flag {

  name: "vibrate_while_unlocked"

  namespace: "systemui"

  description: "This flag controls the vibrate while unlocked setting of polite notifications"

  bug: "270456865"

}
 
 No newline at end of file