Fix notification dot scale in AllApps with grid size enabled (c96fa247) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/BubbleTextView.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -104,6 +104,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		private Drawable mIcon;
		private final boolean mCenterVertically;

		private final int mDisplay;

		private final CheckLongPressHelper mLongPressHelper;
		private final StylusEventHelper mStylusEventHelper;
		private final float mSlop;
		@@ -155,21 +157,21 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		R.styleable.BubbleTextView, defStyle, 0);
		mLayoutHorizontal = a.getBoolean(R.styleable.BubbleTextView_layoutHorizontal, false);

		int display = a.getInteger(R.styleable.BubbleTextView_iconDisplay, DISPLAY_WORKSPACE);
		mDisplay = a.getInteger(R.styleable.BubbleTextView_iconDisplay, DISPLAY_WORKSPACE);
		final int defaultIconSize;
		if (display == DISPLAY_WORKSPACE) {
		if (mDisplay == DISPLAY_WORKSPACE) {
		DeviceProfile grid = mActivity.getWallpaperDeviceProfile();
		setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);
		setCompoundDrawablePadding(grid.iconDrawablePaddingPx);
		defaultIconSize = grid.iconSizePx;
		mIgnorePaddingTouch = true;
		} else if (display == DISPLAY_ALL_APPS) {
		} else if (mDisplay == DISPLAY_ALL_APPS) {
		DeviceProfile grid = mActivity.getDeviceProfile();
		setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);
		setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx);
		defaultIconSize = grid.allAppsIconSizePx;
		mIgnorePaddingTouch = true;
		} else if (display == DISPLAY_FOLDER) {
		} else if (mDisplay == DISPLAY_FOLDER) {
		DeviceProfile grid = mActivity.getDeviceProfile();
		setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.folderChildTextSizePx);
		setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx);
		@@ -582,7 +584,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		mDotInfo = mActivity.getDotInfoForItem(itemInfo);
		boolean isDotted = mDotInfo != null;
		float newDotScale = isDotted ? 1f : 0;
		mDotRenderer = mActivity.getDeviceProfile().mDotRenderer;
		if (mDisplay == DISPLAY_ALL_APPS) {
		mDotRenderer = mActivity.getDeviceProfile().mDotRendererAllApps;
		} else {
		mDotRenderer = mActivity.getDeviceProfile().mDotRendererWorkSpace;
		}
		if (wasDotted \|\| isDotted) {
		// Animate when a dot is first added or when it is removed.
		if (animate && (wasDotted ^ isDotted) && isShown()) {

src/com/android/launcher3/DeviceProfile.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -129,7 +129,8 @@ public class DeviceProfile {
		private boolean mIsSeascape;

		// Notification dots
		public DotRenderer mDotRenderer;
		public DotRenderer mDotRendererWorkSpace;
		public DotRenderer mDotRendererAllApps;

		public DeviceProfile(Context context, InvariantDeviceProfile inv,
		Point minSize, Point maxSize,
		@@ -230,7 +231,10 @@ public class DeviceProfile {
		updateWorkspacePadding();

		// This is done last, after iconSizePx is calculated above.
		mDotRenderer = new DotRenderer(iconSizePx, IconShape.getShapePath(),
		mDotRendererWorkSpace = new DotRenderer(iconSizePx, IconShape.getShapePath(),
		IconShape.DEFAULT_PATH_SIZE);
		mDotRendererAllApps = iconSizePx == allAppsIconSizePx ? mDotRendererWorkSpace :
		new DotRenderer(allAppsIconSizePx, IconShape.getShapePath(),
		IconShape.DEFAULT_PATH_SIZE);
		}

src/com/android/launcher3/folder/FolderIcon.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
		icon.setOnClickListener(ItemClickHandler.INSTANCE);
		icon.mInfo = folderInfo;
		icon.mLauncher = launcher;
		icon.mDotRenderer = grid.mDotRenderer;
		icon.mDotRenderer = grid.mDotRendererWorkSpace;
		icon.setContentDescription(launcher.getString(R.string.folder_name_format, folderInfo.title));
		Folder folder = Folder.fromXml(launcher);
		folder.setDragController(launcher.getDragController());