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

Commit 604b93e5 authored by Richard MacGregor's avatar Richard MacGregor Committed by Android (Google) Code Review
Browse files

Merge "Move flag from systemui to frameworks" into main

parents d854aed1 c6007dc1

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -322,13 +322,6 @@ flag { 
    bug: "202262476"

}



flag {

    name: "screenshare_notification_hiding"

    namespace: "systemui"

    description: "Enable hiding of notifications during screenshare"

    bug: "312784809"

}



flag {

   name: "run_fingerprint_detect_on_dismissible_keyguard"

   namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.statusbar.notification.collection.coordinator 


import android.os.UserHandle

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.Flags.screenshareNotificationHiding

import com.android.server.notification.Flags.screenshareNotificationHiding

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.StatusBarState

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.statusbar.notification.collection.inflation;



import static com.android.systemui.Flags.screenshareNotificationHiding;

import static com.android.server.notification.Flags.screenshareNotificationHiding;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_EXPANDED;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static android.service.notification.NotificationStats.DISMISS_SENTIMENT_N 
import static com.android.app.animation.Interpolators.STANDARD;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_SCROLL_FLING;

import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Flags.screenshareNotificationHiding;

import static com.android.server.notification.Flags.screenshareNotificationHiding;

import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.OnEmptySpaceClickListener;

import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.OnOverscrollTopChangedListener;

packages/SystemUI/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.statusbar.policy;



import static com.android.systemui.Flags.screenshareNotificationHiding;

import static com.android.server.notification.Flags.screenshareNotificationHiding;



import android.media.projection.MediaProjectionInfo;

import android.media.projection.MediaProjectionManager;