Merge "Remove Flags.NOTIFICATION_UPDATES which is cruft from SC" (ad8183aa) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -43,9 +43,6 @@ public class Flags {
		public static final BooleanFlag NEW_NOTIFICATION_PIPELINE_RENDERING =
		new BooleanFlag(101, false);

		public static final BooleanFlag NOTIFICATION_UPDATES =
		new BooleanFlag(102, true);

		public static final BooleanFlag NOTIFICATION_PIPELINE_DEVELOPER_LOGGING =
		new BooleanFlag(103, false);

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -41,11 +41,8 @@ import android.widget.FrameLayout;
		import android.widget.FrameLayout.LayoutParams;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.animation.Interpolators;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
		import com.android.systemui.statusbar.AlphaOptimizedImageView;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		@@ -304,12 +301,9 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
		} else {
		mMenuContainer = new FrameLayout(mContext);
		}
		// The setting can win (which is needed for tests) but if not set, then use the flag
		final int showDismissSetting = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.SHOW_NEW_NOTIF_DISMISS, -1);
		final boolean newFlowHideShelf = showDismissSetting == -1
		? Dependency.get(FeatureFlags.class).isEnabled(Flags.NOTIFICATION_UPDATES)
		: showDismissSetting == 1;
		Settings.Global.SHOW_NEW_NOTIF_DISMISS, /* default = */ 1);
		final boolean newFlowHideShelf = showDismissSetting == 1;
		if (newFlowHideShelf) {
		return;
		}

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

+1 −9

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@ import android.util.MathUtils;

		import com.android.systemui.R;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.statusbar.notification.row.ExpandableView;
		@@ -41,7 +39,6 @@ public class NotificationRoundnessManager {
		private final ExpandableView[] mLastInSectionViews;
		private final ExpandableView[] mTmpFirstInSectionViews;
		private final ExpandableView[] mTmpLastInSectionViews;
		private final FeatureFlags mFeatureFlags;
		private boolean mExpanded;
		private HashSet<ExpandableView> mAnimatedChildren;
		private Runnable mRoundingChangedCallback;
		@@ -56,9 +53,7 @@ public class NotificationRoundnessManager {

		@Inject
		NotificationRoundnessManager(
		NotificationSectionsFeatureManager sectionsFeatureManager,
		FeatureFlags featureFlags) {
		mFeatureFlags = featureFlags;
		NotificationSectionsFeatureManager sectionsFeatureManager) {
		int numberOfSections = sectionsFeatureManager.getNumberOfBuckets();
		mFirstInSectionViews = new ExpandableView[numberOfSections];
		mLastInSectionViews = new ExpandableView[numberOfSections];
		@@ -125,9 +120,6 @@ public class NotificationRoundnessManager {
		ExpandableView viewBefore,
		ExpandableView viewSwiped,
		ExpandableView viewAfter) {
		if (!mFeatureFlags.isEnabled(Flags.NOTIFICATION_UPDATES)) {
		return;
		}
		final boolean animate = true;

		ExpandableView oldViewBefore = mViewBeforeSwipedView;

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

+1 −6

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import androidx.test.filters.SmallTest;

		import com.android.systemui.R;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		@@ -44,7 +43,6 @@ import org.junit.Assert;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		import java.util.HashSet;
		@@ -59,8 +57,6 @@ public class NotificationRoundnessManagerTest extends SysuiTestCase {
		private Runnable mRoundnessCallback = mock(Runnable.class);
		private ExpandableNotificationRow mFirst;
		private ExpandableNotificationRow mSecond;
		@Mock
		private FeatureFlags mFeatureFlags;
		private float mSmallRadiusRatio;

		@Before
		@@ -70,8 +66,7 @@ public class NotificationRoundnessManagerTest extends SysuiTestCase {
		mSmallRadiusRatio = resources.getDimension(R.dimen.notification_corner_radius_small)
		/ resources.getDimension(R.dimen.notification_corner_radius);
		mRoundnessManager = new NotificationRoundnessManager(
		new NotificationSectionsFeatureManager(new DeviceConfigProxy(), mContext),
		mFeatureFlags);
		new NotificationSectionsFeatureManager(new DeviceConfigProxy(), mContext));
		allowTestableLooperAsMainThread();
		NotificationTestHelper testHelper = new NotificationTestHelper(
		mContext,