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

Commit 318deac8 authored by Omar Miatello's avatar Omar Miatello Committed by Automerger Merge Worker
Browse files

Merge "Flag roundness/1: Remove Flags.USE_ROUNDNESS_SOURCETYPES" into udc-dev am: d27cba9d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22746541



Change-Id: I0a5a6d504afc20d247f9864d45c47c2b2f1b12b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4bb36c9 d27cba9d

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

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ object Flags { 
    val NOTIFICATION_MEMORY_LOGGING_ENABLED =

        unreleasedFlag(119, "notification_memory_logging_enabled")



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



    @JvmField

    val SIMPLIFIED_APPEAR_FRACTION =

        releasedFlag(259395680, "simplified_appear_fraction")

packages/SystemUI/src/com/android/systemui/statusbar/LegacyNotificationShelfControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class LegacyNotificationShelfControllerImpl implements NotificationShelfC 
        mActivatableNotificationViewController = activatableNotificationViewController;

        mKeyguardBypassController = keyguardBypassController;

        mStatusBarStateController = statusBarStateController;

        mView.useRoundnessSourceTypes(featureFlags.isEnabled(Flags.USE_ROUNDNESS_SOURCETYPES));

        mView.useRoundnessSourceTypes(true);

        mView.setSensitiveRevealAnimEndabled(featureFlags.isEnabled(Flags.SENSITIVE_REVEAL_ANIM));

        mOnAttachStateChangeListener = new View.OnAttachStateChangeListener() {

            @Override

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java

+1 −2
Original line number Diff line number Diff line
@@ -261,8 +261,7 @@ public class ExpandableNotificationRowController implements NotifViewController 
                mStatusBarStateController.removeCallback(mStatusBarStateListener);

            }

        });

        mView.useRoundnessSourceTypes(

                mFeatureFlags.isEnabled(Flags.USE_ROUNDNESS_SOURCETYPES));

        mView.useRoundnessSourceTypes(true);

    }



    private final StatusBarStateController.StateListener mStatusBarStateListener =

packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewbinder/NotificationShelfViewBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ object NotificationShelfViewBinder { 
        ActivatableNotificationViewBinder.bind(viewModel, shelf, falsingManager)

        shelf.apply {

            setRefactorFlagEnabled(true)

            useRoundnessSourceTypes(featureFlags.isEnabled(Flags.USE_ROUNDNESS_SOURCETYPES))

            useRoundnessSourceTypes(true)

            setSensitiveRevealAnimEndabled(featureFlags.isEnabled(Flags.SENSITIVE_REVEAL_ANIM))

            // TODO(278765923): Replace with eventual NotificationIconContainerViewBinder#bind()

            notificationIconAreaController.setShelfIcons(shelfIcons)

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

+2 −5
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.statusbar.notification.LegacySourceType;

import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;

import com.android.systemui.statusbar.notification.Roundable;
@@ -73,8 +71,7 @@ public class NotificationRoundnessManager implements Dumpable { 
    NotificationRoundnessManager(

            NotificationSectionsFeatureManager sectionsFeatureManager,

            NotificationRoundnessLogger notifLogger,

            DumpManager dumpManager,

            FeatureFlags featureFlags) {

            DumpManager dumpManager) {

        int numberOfSections = sectionsFeatureManager.getNumberOfBuckets();

        mFirstInSectionViews = new ExpandableView[numberOfSections];

        mLastInSectionViews = new ExpandableView[numberOfSections];
@@ -82,7 +79,7 @@ public class NotificationRoundnessManager implements Dumpable { 
        mTmpLastInSectionViews = new ExpandableView[numberOfSections];

        mNotifLogger = notifLogger;

        mDumpManager = dumpManager;

        mUseRoundnessSourceTypes = featureFlags.isEnabled(Flags.USE_ROUNDNESS_SOURCETYPES);

        mUseRoundnessSourceTypes = true;



        mDumpManager.registerDumpable(TAG, this);

    }