Merge "Cleanup SHOW_DOT_PAGINATION flag" into main (48a9a3d1) · Commits · e / os / BlissLauncher3

res/values/dimens.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -245,8 +245,7 @@
		<dimen name="keyboard_drag_stroke_width">4dp</dimen>

		<!-- Folders -->
		<dimen name="page_indicator_dot_size">8dp</dimen>
		<dimen name="page_indicator_dot_size_v2">6dp</dimen>
		<dimen name="page_indicator_dot_size">6dp</dimen>
		<dimen name="page_indicator_size">10dp</dimen>

src/com/android/launcher3/Launcher.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import static com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID;
		import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.getSupportedActions;
		import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE;
		import static com.android.launcher3.config.FeatureFlags.MULTI_SELECT_EDIT_MODE;
		import static com.android.launcher3.config.FeatureFlags.SHOW_DOT_PAGINATION;
		import static com.android.launcher3.config.FeatureFlags.shouldShowFirstPageWidget;
		import static com.android.launcher3.logging.StatsLogManager.EventEnum;
		import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
		@@ -1325,18 +1324,14 @@ public class Launcher extends StatefulActivity<LauncherState>
		mDropTargetBar.setup(mDragController);
		mAllAppsController.setupViews(mScrimView, mAppsView);

		if (SHOW_DOT_PAGINATION.get()) {
		mWorkspace.getPageIndicator().setShouldAutoHide(true);
		mWorkspace.getPageIndicator().setPaintColor(
		Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText)
		? Color.BLACK
		: Color.WHITE);
		}
		mWorkspace.getPageIndicator().setPaintColor(Themes.getAttrBoolean(
		this, R.attr.isWorkspaceDarkText) ? Color.BLACK : Color.WHITE);
		}

		@Override
		public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
		if (SHOW_DOT_PAGINATION.get() && WorkspacePageIndicator.class.getName().equals(name)) {
		if (WorkspacePageIndicator.class.getName().equals(name)) {
		return LayoutInflater.from(context).inflate(R.layout.page_indicator_dots,
		(ViewGroup) parent, false);
		}

src/com/android/launcher3/config/FeatureFlags.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -152,9 +152,6 @@ public final class FeatureFlags {
		// TODO(Block 8): Clean up flags

		// TODO(Block 9): Clean up flags

		public static final BooleanFlag SHOW_DOT_PAGINATION = getDebugFlag(270395278,
		"SHOW_DOT_PAGINATION", ENABLED, "Enable showing dot pagination in workspace");
		public static final BooleanFlag UNFOLDED_WIDGET_PICKER = getDebugFlag(301918659,
		"UNFOLDED_WIDGET_PICKER", DISABLED, "Enable new widget picker that takes "
		+ "advantage of the unfolded foldable format");

src/com/android/launcher3/pageindicators/PageIndicatorDots.java

+7 −14

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.launcher3.pageindicators;

		import static com.android.launcher3.config.FeatureFlags.SHOW_DOT_PAGINATION;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		@@ -69,7 +67,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator
		private static final int PAGE_INDICATOR_ALPHA = 255;
		private static final int DOT_ALPHA = 128;
		private static final float DOT_ALPHA_FRACTION = 0.5f;
		private static final int DOT_GAP_FACTOR = SHOW_DOT_PAGINATION.get() ? 4 : 3;
		private static final int DOT_GAP_FACTOR = 4;
		private static final int VISIBLE_ALPHA = 255;
		private static final int INVISIBLE_ALPHA = 0;
		private Paint mPaginationPaint;
		@@ -153,10 +151,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator
		mPaginationPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
		mPaginationPaint.setStyle(Style.FILL);
		mPaginationPaint.setColor(Themes.getAttrColor(context, R.attr.folderPaginationColor));
		mDotRadius = (SHOW_DOT_PAGINATION.get()
		? getResources().getDimension(R.dimen.page_indicator_dot_size_v2)
		: getResources().getDimension(R.dimen.page_indicator_dot_size))
		/ 2;
		mDotRadius = getResources().getDimension(R.dimen.page_indicator_dot_size) / 2;
		mCircleGap = DOT_GAP_FACTOR * mDotRadius;
		setOutlineProvider(new MyOutlineProver());
		mIsRtl = Utilities.isRtl(getResources());
		@@ -164,7 +159,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator

		@Override
		public void setScroll(int currentScroll, int totalScroll) {
		if (SHOW_DOT_PAGINATION.get() && currentScroll == 0 && totalScroll == 0) {
		if (currentScroll == 0 && totalScroll == 0) {
		CURRENT_POSITION.set(this, (float) mActivePage);
		return;
		}
		@@ -217,7 +212,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator

		@Override
		public void setShouldAutoHide(boolean shouldAutoHide) {
		mShouldAutoHide = shouldAutoHide && SHOW_DOT_PAGINATION.get();
		mShouldAutoHide = shouldAutoHide;
		if (shouldAutoHide && mPaginationPaint.getAlpha() > INVISIBLE_ALPHA) {
		hideAfterDelay();
		} else if (!shouldAutoHide) {
		@@ -420,16 +415,14 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator
		int alpha = mPaginationPaint.getAlpha();

		// Here we draw the dots
		mPaginationPaint.setAlpha(SHOW_DOT_PAGINATION.get()
		? ((int) (alpha * DOT_ALPHA_FRACTION))
		: DOT_ALPHA);
		mPaginationPaint.setAlpha((int) (alpha * DOT_ALPHA_FRACTION));
		for (int i = 0; i < mNumPages; i++) {
		canvas.drawCircle(x, y, mDotRadius, mPaginationPaint);
		x += circleGap;
		}

		// Here we draw the current page indicator
		mPaginationPaint.setAlpha(SHOW_DOT_PAGINATION.get() ? alpha : PAGE_INDICATOR_ALPHA);
		mPaginationPaint.setAlpha(alpha);
		canvas.drawRoundRect(getActiveRect(), mDotRadius, mDotRadius, mPaginationPaint);
		}
		}
		@@ -498,7 +491,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator
		@Override
		public void onAnimationEnd(Animator animation) {
		if (!mCancelled) {
		if (mShouldAutoHide && SHOW_DOT_PAGINATION.get()) {
		if (mShouldAutoHide) {
		hideAfterDelay();
		}
		mAnimator = null;