Merge "Moving all widget picker tests to instrumentation tests" into sc-v2-dev (494bbb0b) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/BaseActivity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
		/**
		* Returns {@link StatsLogManager} for user event logging.
		*/
		@Override
		public StatsLogManager getStatsLogManager() {
		if (mStatsLogManager == null) {
		mStatsLogManager = StatsLogManager.newInstance(this);

src/com/android/launcher3/views/ActivityContext.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.dot.DotInfo;
		import com.android.launcher3.dragndrop.DragController;
		import com.android.launcher3.folder.FolderIcon;
		import com.android.launcher3.logging.StatsLogManager;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.util.ViewCache;

		@@ -109,6 +110,10 @@ public interface ActivityContext {
		return null;
		}

		default StatsLogManager getStatsLogManager() {
		return StatsLogManager.newInstance((Context) this);
		}

		/**
		* Returns the ActivityContext associated with the given Context.
		*/

src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package com.android.launcher3.widget;

		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

		import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.Canvas;
		@@ -34,7 +35,6 @@ import android.util.Size;

		import androidx.annotation.NonNull;

		import com.android.launcher3.BaseActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.R;
		@@ -46,6 +46,7 @@ import com.android.launcher3.icons.cache.HandlerRunnable;
		import com.android.launcher3.model.WidgetItem;
		import com.android.launcher3.pm.ShortcutConfigActivityInfo;
		import com.android.launcher3.util.Executors;
		import com.android.launcher3.views.ActivityContext;
		import com.android.launcher3.widget.util.WidgetSizes;

		import java.util.concurrent.ExecutionException;
		@@ -56,10 +57,10 @@ public class DatabaseWidgetPreviewLoader {

		private static final String TAG = "WidgetPreviewLoader";

		private final BaseActivity mContext;
		private final Context mContext;
		private final float mPreviewBoxCornerRadius;

		public DatabaseWidgetPreviewLoader(BaseActivity context) {
		public DatabaseWidgetPreviewLoader(Context context) {
		mContext = context;
		float previewCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context);
		mPreviewBoxCornerRadius = previewCornerRadius > 0
		@@ -139,12 +140,13 @@ public class DatabaseWidgetPreviewLoader {
		int previewWidth;
		int previewHeight;

		DeviceProfile dp = ActivityContext.lookupContext(mContext).getDeviceProfile();

		if (widgetPreviewExists && drawable.getIntrinsicWidth() > 0
		&& drawable.getIntrinsicHeight() > 0) {
		previewWidth = drawable.getIntrinsicWidth();
		previewHeight = drawable.getIntrinsicHeight();
		} else {
		DeviceProfile dp = mContext.getDeviceProfile();
		Size widgetSize = WidgetSizes.getWidgetPaddedSizePx(mContext, info.provider, dp, spanX,
		spanY);
		previewWidth = widgetSize.getWidth();
		@@ -215,7 +217,7 @@ public class DatabaseWidgetPreviewLoader {
		Drawable icon = LauncherAppState.getInstance(mContext).getIconCache()
		.getFullResIcon(info.provider.getPackageName(), info.icon);
		if (icon != null) {
		int appIconSize = mContext.getDeviceProfile().iconSizePx;
		int appIconSize = dp.iconSizePx;
		int iconSize = (int) Math.min(appIconSize * scale,
		Math.min(boxRect.width(), boxRect.height()));

		@@ -248,7 +250,7 @@ public class DatabaseWidgetPreviewLoader {

		private Bitmap generateShortcutPreview(
		ShortcutConfigActivityInfo info, int maxWidth, int maxHeight) {
		int iconSize = mContext.getDeviceProfile().allAppsIconSizePx;
		int iconSize = ActivityContext.lookupContext(mContext).getDeviceProfile().allAppsIconSizePx;
		int padding = mContext.getResources()
		.getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);

src/com/android/launcher3/widget/WidgetCell.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import android.widget.TextView;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.launcher3.BaseActivity;
		import com.android.launcher3.CheckLongPressHelper;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.Launcher;
		@@ -123,7 +122,7 @@ public class WidgetCell extends LinearLayout {
		protected HandlerRunnable mActiveRequest;
		private boolean mAnimatePreview = true;

		protected final BaseActivity mActivity;
		protected final ActivityContext mActivity;
		private final CheckLongPressHelper mLongPressHelper;
		private final float mEnforcedCornerRadius;

		@@ -143,8 +142,8 @@ public class WidgetCell extends LinearLayout {
		public WidgetCell(Context context, AttributeSet attrs, int defStyle) {
		super(context, attrs, defStyle);

		mActivity = BaseActivity.fromContext(context);
		mWidgetPreviewLoader = new DatabaseWidgetPreviewLoader(mActivity);
		mActivity = ActivityContext.lookupContext(context);
		mWidgetPreviewLoader = new DatabaseWidgetPreviewLoader(context);
		mLongPressHelper = new CheckLongPressHelper(this);
		mLongPressHelper.setLongPressTimeoutFactor(1);

src/com/android/launcher3/widget/picker/WidgetsListAdapter.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -39,13 +39,13 @@ import androidx.recyclerview.widget.RecyclerView.Adapter;
		import androidx.recyclerview.widget.RecyclerView.LayoutParams;
		import androidx.recyclerview.widget.RecyclerView.ViewHolder;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.R;
		import com.android.launcher3.icons.IconCache;
		import com.android.launcher3.model.data.PackageItemInfo;
		import com.android.launcher3.recyclerview.ViewHolderBinder;
		import com.android.launcher3.util.LabelComparator;
		import com.android.launcher3.util.PackageUserKey;
		import com.android.launcher3.views.ActivityContext;
		import com.android.launcher3.widget.model.WidgetListSpaceEntry;
		import com.android.launcher3.widget.model.WidgetsListBaseEntry;
		import com.android.launcher3.widget.model.WidgetsListContentEntry;
		@@ -85,7 +85,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
		private static final int VIEW_TYPE_WIDGETS_HEADER = R.id.view_type_widgets_header;
		private static final int VIEW_TYPE_WIDGETS_SEARCH_HEADER = R.id.view_type_widgets_search_header;

		private final Launcher mLauncher;
		private final Context mContext;
		private final WidgetsDiffReporter mDiffReporter;
		private final SparseArray<ViewHolderBinder> mViewHolderBinders = new SparseArray<>();
		private final WidgetListBaseRowEntryComparator mRowComparator =
		@@ -109,7 +109,7 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
		public WidgetsListAdapter(Context context, LayoutInflater layoutInflater,
		IconCache iconCache, IntSupplier emptySpaceHeightProvider,
		OnClickListener iconClickListener, OnLongClickListener iconLongClickListener) {
		mLauncher = Launcher.getLauncher(context);
		mContext = context;
		mDiffReporter = new WidgetsDiffReporter(iconCache, this);
		WidgetsListDrawableFactory listDrawableFactory = new WidgetsListDrawableFactory(context);

		@@ -340,7 +340,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC

		if (showWidgets) {
		mWidgetsContentVisiblePackageUserKey = packageUserKey;
		mLauncher.getStatsLogManager().logger().log(LAUNCHER_WIDGETSTRAY_APP_EXPANDED);
		ActivityContext.lookupContext(mContext)
		.getStatsLogManager().logger().log(LAUNCHER_WIDGETSTRAY_APP_EXPANDED);
		} else {
		mWidgetsContentVisiblePackageUserKey = null;
		}