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

Commit c1e24e10 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes Ie539c898,I92e041ed,I9e8030b4,I38442212,I355d0330, ... into udc-dev 

* changes:
  Remove NOTIFICATION_INLINE_REPLY_ANIMATION flag
  Remove NOTIFICATION_GROUP_DISMISSAL_ANIMATION flag
  Remove NOTIFICATION_DISMISSAL_FADE flag
  Remove FSI_ON_DND_UPDATE flag
  Remove LEAVE_SHADE_OPEN_FOR_BUGREPORT flag
  Remove FILTER_UNSEEN_NOTIFS_ON_KEYGUARD flag
  Remove FSI_REQUIRES_KEYGUARD flag
parents b251dc92 8423cd96

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

+0 −24
Original line number Diff line number Diff line
@@ -58,12 +58,6 @@ object Flags { 
            "notification_drag_to_contents"

        )



    // TODO(b/254512517): Tracking Bug

    val FSI_REQUIRES_KEYGUARD = releasedFlag(110, "fsi_requires_keyguard")



    // TODO(b/259130119): Tracking Bug

    val FSI_ON_DND_UPDATE = releasedFlag(259130119, "fsi_on_dnd_update")



    // TODO(b/254512538): Tracking Bug

    val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply")
@@ -74,16 +68,8 @@ object Flags { 
    val NOTIFICATION_MEMORY_LOGGING_ENABLED =

        unreleasedFlag(119, "notification_memory_logging_enabled")



    // TODO(b/254512731): Tracking Bug

    @JvmField val NOTIFICATION_DISMISSAL_FADE = releasedFlag(113, "notification_dismissal_fade")



    @JvmField val USE_ROUNDNESS_SOURCETYPES = releasedFlag(116, "use_roundness_sourcetype")



    // TODO(b/259217907)

    @JvmField

    val NOTIFICATION_GROUP_DISMISSAL_ANIMATION =

        releasedFlag(259217907, "notification_group_dismissal_animation")



    @JvmField

    val SIMPLIFIED_APPEAR_FRACTION =

        unreleasedFlag(259395680, "simplified_appear_fraction", teamfood = true)
@@ -91,14 +77,6 @@ object Flags { 
    // TODO(b/257315550): Tracking Bug

    val NO_HUN_FOR_OLD_WHEN = releasedFlag(118, "no_hun_for_old_when")



    // TODO(b/260335638): Tracking Bug

    @JvmField

    val NOTIFICATION_INLINE_REPLY_ANIMATION =

        releasedFlag(174148361, "notification_inline_reply_animation")



    val FILTER_UNSEEN_NOTIFS_ON_KEYGUARD =

        releasedFlag(254647461, "filter_unseen_notifs_on_keyguard")



    // TODO(b/277338665): Tracking Bug

    @JvmField

    val NOTIFICATION_SHELF_REFACTOR =
@@ -613,8 +591,6 @@ object Flags { 
    @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag(1701, "clipboard_remote_behavior")



    // 1800 - shade container

    @JvmField

    val LEAVE_SHADE_OPEN_FOR_BUGREPORT = releasedFlag(1800, "leave_shade_open_for_bugreport")

    // TODO(b/265944639): Tracking Bug

    @JvmField val DUAL_SHADE = unreleasedFlag(1801, "dual_shade")

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+0 −5
Original line number Diff line number Diff line
@@ -1043,9 +1043,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                            Log.w(TAG, "Bugreport handler could not be launched");

                            mIActivityManager.requestInteractiveBugReport();

                        }

                        // Maybe close shade (depends on a flag) so user sees the activity

                        mCentralSurfacesOptional.ifPresent(

                                CentralSurfaces::collapseShadeForBugreport);

                    } catch (RemoteException e) {

                    }

                }
@@ -1064,8 +1061,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                mMetricsLogger.action(MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL);

                mUiEventLogger.log(GlobalActionsEvent.GA_BUGREPORT_LONG_PRESS);

                mIActivityManager.requestFullBugReport();

                // Maybe close shade (depends on a flag) so user sees the activity

                mCentralSurfacesOptional.ifPresent(CentralSurfaces::collapseShadeForBugreport);

            } catch (RemoteException e) {

            }

            return false;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt

+0 −14
Original line number Diff line number Diff line
@@ -31,26 +31,12 @@ class NotifPipelineFlags @Inject constructor( 
    fun isDevLoggingEnabled(): Boolean =

        featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING)



    fun fullScreenIntentRequiresKeyguard(): Boolean =

        featureFlags.isEnabled(Flags.FSI_REQUIRES_KEYGUARD)



    fun fsiOnDNDUpdate(): Boolean = featureFlags.isEnabled(Flags.FSI_ON_DND_UPDATE)



    fun forceDemoteFsi(): Boolean =

            sysPropFlags.isEnabled(NotificationFlags.FSI_FORCE_DEMOTE)



    fun showStickyHunForDeniedFsi(): Boolean =

            sysPropFlags.isEnabled(NotificationFlags.SHOW_STICKY_HUN_FOR_DENIED_FSI)



    fun allowDismissOngoing(): Boolean =

            sysPropFlags.isEnabled(NotificationFlags.ALLOW_DISMISS_ONGOING)



    fun isOtpRedactionEnabled(): Boolean =

            sysPropFlags.isEnabled(NotificationFlags.OTP_REDACTION)



    val shouldFilterUnseenNotifsOnKeyguard: Boolean

        get() = featureFlags.isEnabled(Flags.FILTER_UNSEEN_NOTIFS_ON_KEYGUARD)



    val isNoHunForOldWhenEnabled: Boolean

        get() = featureFlags.isEnabled(Flags.NO_HUN_FOR_OLD_WHEN)

}

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

+2 −3
Original line number Diff line number Diff line
@@ -392,8 +392,7 @@ class HeadsUpCoordinator @Inject constructor( 
            mNotificationInterruptStateProvider.logFullScreenIntentDecision(entry, fsiDecision)

            if (fsiDecision.shouldLaunch) {

                mLaunchFullScreenIntentProvider.launchFullScreenIntent(entry)

            } else if (mFlags.fsiOnDNDUpdate() &&

                fsiDecision == FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) {

            } else if (fsiDecision == FullScreenIntentDecision.NO_FSI_SUPPRESSED_ONLY_BY_DND) {

                // If DND was the only reason this entry was suppressed, note it for potential

                // reconsideration on later ranking updates.

                addForFSIReconsideration(entry, mSystemClock.currentTimeMillis())
@@ -509,7 +508,7 @@ class HeadsUpCoordinator @Inject constructor( 
                //   - was suppressed from FSI launch only by a DND suppression

                //   - is within the recency window for reconsideration

                // If any of these entries are no longer suppressed, launch the FSI now.

                if (mFlags.fsiOnDNDUpdate() && isCandidateForFSIReconsideration(entry)) {

                if (isCandidateForFSIReconsideration(entry)) {

                    val decision =

                        mNotificationInterruptStateProvider.getFullScreenIntentDecision(entry)

                    if (decision.shouldLaunch) {

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

+1 −3
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ constructor( 
        pipeline.addFinalizeFilter(notifFilter)

        keyguardNotificationVisibilityProvider.addOnStateChangedListener(::invalidateListFromFilter)

        updateSectionHeadersVisibility()

        if (notifPipelineFlags.shouldFilterUnseenNotifsOnKeyguard) {

        attachUnseenFilter(pipeline)

    }

    }



    private fun attachUnseenFilter(pipeline: NotifPipeline) {

        pipeline.addFinalizeFilter(unseenNotifFilter)