Merge branch '000-t-fixes' into 'v1-t' (92f925d2) · Commits · e / os / BlissLauncher3

bliss/src/foundation/e/bliss/folder/GridFolder.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ public class GridFolder extends Folder implements OnAlarmListener {

		@Override
		public void onFolderOpenStart() {
		setVisibility(View.VISIBLE);
		mLastStateBeforeOpen = mLauncher.getStateManager().getState();
		if (!mLauncher.isInState(NORMAL)) {
		mLauncher.getStateManager().goToState(LauncherState.NORMAL, false);

+3 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,9 @@ class BlissAppWidgetHost(val context: Context) : AppWidgetHost(context, WIDGET_H
		fun createView(widgetId: Int, widgetInfo: AppWidgetProviderInfo): AppWidgetHostView {
		return createView(context, widgetId, widgetInfo).apply {
		val widgetTopBottom =
		resources.getDimensionPixelSize(R.dimen.widget_page_top_bottom_padding)
		val widgetLeftRight = resources.getDimensionPixelSize(R.dimen.widget_page_all_padding)
		context.resources.getDimensionPixelSize(R.dimen.widget_page_top_bottom_padding)
		val widgetLeftRight =
		context.resources.getDimensionPixelSize(R.dimen.widget_page_all_padding)
		setPaddingRelative(widgetLeftRight, widgetTopBottom, widgetLeftRight, widgetTopBottom)
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,8 @@ public class RoundedWidgetView extends LauncherAppWidgetHostView implements Offs
		@Override
		public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
		super.setAppWidget(appWidgetId, info);
		int widgetTopBottom = getResources().getDimensionPixelSize(R.dimen.widget_page_top_bottom_padding);
		int widgetLeftRight = getResources().getDimensionPixelSize(R.dimen.widget_page_all_padding);
		int widgetTopBottom = mContext.getResources().getDimensionPixelSize(R.dimen.widget_page_top_bottom_padding);
		int widgetLeftRight = mContext.getResources().getDimensionPixelSize(R.dimen.widget_page_all_padding);
		setPadding(widgetLeftRight, widgetTopBottom, widgetLeftRight, widgetTopBottom);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont
		val info = (it as AppWidgetHostView).appWidgetInfo
		val opts =
		WidgetSizes.getWidgetSizeOptions(
		context,
		mLauncher,
		info.provider,
		mLauncher.deviceProfile.inv.numColumns,
		mLauncher.deviceProfile.inv.numRows
		@@ -428,7 +428,7 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont

		opts =
		WidgetSizes.getWidgetSizeOptions(
		context,
		launcher,
		info.provider,
		launcher.deviceProfile.inv.numColumns,
		launcher.deviceProfile.inv.numRows

+0 −7

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.appprediction.PredictionRowView;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.dragndrop.DragOptions;
		import com.android.launcher3.folder.Folder;
		import com.android.launcher3.hybridhotseat.HotseatPredictionController;
		import com.android.launcher3.logging.InstanceId;
		import com.android.launcher3.logging.StatsLogManager;
		@@ -441,13 +440,7 @@ public class QuickstepLauncher extends Launcher {
		} else {
		SystemUiProxy.INSTANCE.get(this).setShelfHeight(visible, profile.hotseatBarSizePx);
		}

		Folder folder = Folder.getOpen(this);
		if (folder != null && !folder.isFolderWobbling()) {
		folder.setVisibility((state == NORMAL) ? View.VISIBLE : View.INVISIBLE);
		}
		}

		if (state == NORMAL && !inTransition) {
		((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false);
		}