优化代码，修改手机设置仅一次时不在加载其他屏幕问题

Author: yuchuangu85

effectivecard/src/main/java/com/codemx/effectivecard/LauncherOverlayView.java

@@ -16,6 +16,7 @@
  * TIME 18:16
  */
 public class LauncherOverlayView extends FrameLayout {
+
  public LauncherOverlayView(@NonNull Context context) {
  super(context);
  }

src/com/android/launcher3/Launcher.java

@@ -1903,6 +1903,7 @@ public void startBinding() {
 
  @Override
  public void bindScreens(ArrayList<Long> orderedScreenIds) {
+ XLog.e(XLog.getTag(), XLog.TAG_GU + orderedScreenIds);
  // Make sure the first screen is always at the start.
  if (FeatureFlags.QSB_ON_FIRST_SCREEN &&
  orderedScreenIds.indexOf(Workspace.FIRST_SCREEN_ID) != 0) {
@@ -1931,6 +1932,7 @@ public void bindScreens(ArrayList<Long> orderedScreenIds) {
  }
 
  private void bindAddScreens(ArrayList<Long> orderedScreenIds) {
+ XLog.e(XLog.getTag(), XLog.TAG_GU + orderedScreenIds);
  int count = orderedScreenIds.size();
  for (int i = 0; i < count; i++) {
  long screenId = orderedScreenIds.get(i);

src/com/android/launcher3/LauncherModel.java

@@ -28,7 +28,6 @@
 import android.os.Looper;
 import android.os.Process;
 import android.os.UserHandle;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -61,6 +60,7 @@
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.util.ViewOnDrawExecutor;
 import com.android.launcher3.widget.WidgetListRowEntry;
+import com.android.mxlibrary.util.XLog;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -72,6 +72,8 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.Executor;
 
+import androidx.annotation.Nullable;
+
 import static com.android.launcher3.LauncherAppState.ACTION_FORCE_ROLOAD;
 import static com.android.launcher3.config.FeatureFlags.IS_DOGFOOD_BUILD;
 
@@ -197,12 +199,18 @@ public void bindAppsAdded(ArrayList<Long> newScreens,
  * Runs the specified runnable immediately if called from the worker thread, otherwise it is
  * posted on the worker thread handler.
  */
- private static void runOnWorkerThread(Runnable r) {
+ private static void runOnWorkerThread(Runnable r, boolean isRemoveAfterRun) {
  if (sWorkerThread.getThreadId() == Process.myTid()) {
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
  r.run();
  } else {
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
  // If we are not on the worker thread, then post to the worker handler
  sWorker.post(r);
+ // TODO 存在部分系统会重新调用问题
+ if (isRemoveAfterRun) {
+ sWorker.removeCallbacks(r);
+ }
  }
  }
 
@@ -289,18 +297,19 @@ public void run() {
  }
  }
  };
- runOnWorkerThread(r);
+ runOnWorkerThread(r, false);
  }
 
  /**
  * Update the order of the workspace screens in the database. The array list contains
  * a list of screen ids in the order that they should appear.
  */
  public static void updateWorkspaceScreenOrder(Context context, final ArrayList<Long> screens) {
- final ArrayList<Long> screensCopy = new ArrayList<Long>(screens);
+ XLog.e(XLog.getTag(), XLog.TAG_GU + screens);
+ final ArrayList<Long> screensCopy = new ArrayList<>(screens);
  final ContentResolver cr = context.getContentResolver();
  final Uri uri = LauncherSettings.WorkspaceScreens.CONTENT_URI;
-
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
  // Remove any negative screen ids -- these aren't persisted
  Iterator<Long> iter = screensCopy.iterator();
  while (iter.hasNext()) {
@@ -309,13 +318,14 @@ public static void updateWorkspaceScreenOrder(Context context, final ArrayList<L
  iter.remove();
  }
  }
-
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
  Runnable r = new Runnable() {
  @Override
  public void run() {
  ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
  // Clear the table
  ops.add(ContentProviderOperation.newDelete(uri).build());
+ XLog.e(XLog.getTag(), XLog.TAG_GU + screensCopy);
  int count = screensCopy.size();
  for (int i = 0; i < count; i++) {
  ContentValues v = new ContentValues();
@@ -326,8 +336,10 @@ public void run() {
  }
 
  try {
+ XLog.e(XLog.getTag(), XLog.TAG_GU + ops);
  cr.applyBatch(LauncherProvider.AUTHORITY, ops);
  } catch (Exception ex) {
+ XLog.e(XLog.getTag(), XLog.TAG_GU + ex.getMessage());
  throw new RuntimeException(ex);
  }
 
@@ -337,7 +349,8 @@ public void run() {
  }
  }
  };
- runOnWorkerThread(r);
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
+ runOnWorkerThread(r, true);
  }
 
  /**
@@ -455,6 +468,7 @@ public void onReceive(Context context, Intent intent) {
  * not be called as DB updates are automatically followed by UI update
  */
  public void forceReload() {
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
  synchronized (mLock) {
  // Stop any existing loaders first, so they don't set mModelLoaded to true later
  stopLoader();
@@ -479,6 +493,7 @@ public boolean isCurrentCallbacks(Callbacks callbacks) {
  * @return true if the page could be bound synchronously.
  */
  public boolean startLoader(int synchronousBindPage) {
+ XLog.e(XLog.getTag(), XLog.TAG_GU);
  // Enable queue before starting loader. It will get disabled in Launcher#finishBindingItems
  InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_LOADER_RUNNING);
  synchronized (mLock) {
@@ -527,7 +542,7 @@ public void startLoaderForResults(LoaderResults results) {
  synchronized (mLock) {
  stopLoader();
  mLoaderTask = new LoaderTask(mApp, mBgAllAppsList, sBgDataModel, results);
- runOnWorkerThread(mLoaderTask);
+ runOnWorkerThread(mLoaderTask, false);
  }
  }
 
@@ -614,7 +629,7 @@ public void onPackageIconsUpdated(HashSet<String> updatedPackages, UserHandle us
 
  public void enqueueModelUpdateTask(ModelUpdateTask task) {
  task.init(mApp, this, sBgDataModel, mBgAllAppsList, mUiExecutor);
- runOnWorkerThread(task);
+ runOnWorkerThread(task, false);
  }
 
  /**

src/com/android/launcher3/LauncherProvider.java

@@ -72,6 +72,8 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 
+import androidx.annotation.NonNull;
+
 public class LauncherProvider extends ContentProvider {
  private static final String TAG = "LauncherProvider";
  private static final boolean LOGD = false;
@@ -306,8 +308,9 @@ public int bulkInsert(Uri uri, ContentValues[] values) {
  }
 
  @Override
- public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
+ public @NonNull ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
  throws OperationApplicationException {
+ XLog.e(XLog.getTag(), XLog.TAG_GU + operations);
  createDbIfNotExists();
  try (SQLiteTransaction t = new SQLiteTransaction(mOpenHelper.getWritableDatabase())) {
  ContentProviderResult[] result = super.applyBatch(operations);

src/com/android/launcher3/Workspace.java

@@ -655,7 +655,7 @@ private void convertFinalScreenToEmptyScreenIfNecessary() {
  // if this is the last screen, convert it to the empty screen
  mWorkspaceScreens.put(EXTRA_EMPTY_SCREEN_ID, finalScreen);
  mScreenOrder.add(EXTRA_EMPTY_SCREEN_ID);
-
+ XLog.e(XLog.getTag(), XLog.TAG_GU + mScreenOrder);
  // Update the model if we have changed any screens
  LauncherModel.updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
  }
@@ -766,7 +766,7 @@ public long commitExtraEmptyScreen() {
  .getLong(LauncherSettings.Settings.EXTRA_VALUE);
  mWorkspaceScreens.put(newId, cl);
  mScreenOrder.add(newId);
-
+ XLog.e(XLog.getTag(),XLog.TAG_GU + mScreenOrder);
  // Update the model for the new screen
  LauncherModel.updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
 

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

@@ -54,13 +54,13 @@ abstract class BaseFlags {
  public static final boolean OVERVIEW_USE_SCREENSHOT_ORIENTATION = true;
 
  // 是否禁用双指捏掐到预览模式
- public static final boolean LAUNCHER3_DISABLE_PINCH_TO_OVERVIEW = false;
+ public static final boolean LAUNCHER3_DISABLE_PINCH_TO_OVERVIEW = true;
 
  // 是否循环滑动
- public static final boolean LAUNCHER3_CIRCLE_SCROLL = false;
+ public static final boolean LAUNCHER3_CIRCLE_SCROLL = true;
 
  // 是否开启负一屏，当LAUNCHER_OVERLAY_ENABLED = false才起作用
- public static final boolean CUSTOM_CONTENT_ENABLED = true;
+ public static final boolean CUSTOM_CONTENT_ENABLED = false;
  // 是否开启跨进程的负一屏，如果开启，则不会开启CustomContent负一屏
  public static final boolean LAUNCHER_OVERLAY_ENABLED = false;
 

src/com/android/launcher3/dragndrop/DragLayer.java

@@ -212,7 +212,6 @@ public boolean onHoverEvent(MotionEvent ev) {
  return false;
  }
 
-
  private boolean isInAccessibleDrag() {
  return mActivity.getAccessibilityDelegate().isInAccessibleDrag();
  }

src/com/android/launcher3/menu/CircleMenuView.java

@@ -4,8 +4,6 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -26,11 +24,15 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 
 /**
  * CircleMenuView
  */
-public class CircleMenuView extends ViewGroup implements View.OnClickListener, Insettable, View.OnLongClickListener {
+public class CircleMenuView extends ViewGroup implements View.OnClickListener, Insettable,
+ View.OnLongClickListener {
 
  private static final int DEFAULT_BUTTON_SIZE = 56;
  private static final float DEFAULT_DISTANCE = DEFAULT_BUTTON_SIZE * 1.5f;

src/com/android/launcher3/model/AddWorkspaceItemsNoPositionTask.java

@@ -6,6 +6,7 @@
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
+import com.android.launcher3.LauncherSettings;
 import com.android.mxlibrary.util.XLog;
 
 import java.util.ArrayList;
@@ -35,10 +36,30 @@ public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList app
  // called.
  ArrayList<Long> workspaceScreens = LauncherModel.loadWorkspaceScreensDb(context);
 
+ XLog.e(XLog.getTag(), XLog.TAG_GU + workspaceScreens);
  XLog.e(XLog.getTag(), XLog.TAG_GU + mAllAppsNoPotion.size());
+ synchronized (dataModel) {
+ List<ItemInfo> filteredItems = new ArrayList<>();
+ for (ItemInfo itemInfo : mAllAppsNoPotion) {
+ if (itemInfo == null) {
+ continue;
+ }
+ if (itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
+ itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT ||
+ itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET ||
+ itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET ||
+ itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
+ // Short-circuit this logic if the icon exists somewhere on the workspace
+ if (shortcutExists(dataModel, itemInfo.getIntent(), itemInfo.user)) {
+ continue;
+ }
+ }
+ filteredItems.add(itemInfo);
+ }
 
- filterAddedItemsFinal(app, dataModel, apps, workspaceScreens, mAllAppsNoPotion, addedWorkspaceScreensFinal, addedItemsFinal);
-
+ filterAddedItemsFinal(app, dataModel, apps, workspaceScreens, filteredItems, addedWorkspaceScreensFinal, addedItemsFinal);
+ XLog.e(XLog.getTag(), XLog.TAG_GU + workspaceScreens + " final " + addedWorkspaceScreensFinal);
+ }
  // Update the workspace screens
  updateScreens(context, workspaceScreens);
 

src/com/android/launcher3/model/AddWorkspaceItemsTask.java

@@ -16,17 +16,14 @@
 package com.android.launcher3.model;
 
 import android.content.Context;
-import android.content.Intent;
-import android.os.UserHandle;
 import android.util.Pair;
 
 import com.android.launcher3.AllAppsList;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.ShortcutInfo;
-import com.android.launcher3.Utilities;
+import com.android.mxlibrary.util.XLog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -80,68 +77,13 @@ public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList app
 
  filterAddedItemsFinal(app, dataModel, apps, workspaceScreens, filteredItems, addedWorkspaceScreensFinal, addedItemsFinal);
  }
-
+ XLog.d(XLog.getTag(), workspaceScreens + " final " + addedWorkspaceScreensFinal);
  // Update the workspace screens
  updateScreens(context, workspaceScreens);
 
  bindAddedItemsFinal(addedWorkspaceScreensFinal, addedItemsFinal);
  }
 
 
- /**
- * Returns true if the shortcuts already exists on the workspace. This must be called after
- * the workspace has been loaded. We identify a shortcut by its intent.
- */
- protected boolean shortcutExists(BgDataModel dataModel, Intent intent, UserHandle user) {
- final String compPkgName, intentWithPkg, intentWithoutPkg;
- if (intent == null) {
- // Skip items with null intents
- return true;
- }
- if (intent.getComponent() != null) {
- // If component is not null, an intent with null package will produce
- // the same result and should also be a match.
- compPkgName = intent.getComponent().getPackageName();
- if (intent.getPackage() != null) {
- intentWithPkg = intent.toUri(0);
- intentWithoutPkg = new Intent(intent).setPackage(null).toUri(0);
- } else {
- intentWithPkg = new Intent(intent).setPackage(compPkgName).toUri(0);
- intentWithoutPkg = intent.toUri(0);
- }
- } else {
- compPkgName = null;
- intentWithPkg = intent.toUri(0);
- intentWithoutPkg = intent.toUri(0);
- }
-
- boolean isLauncherAppTarget = Utilities.isLauncherAppTarget(intent);
- synchronized (dataModel) {
- for (ItemInfo item : dataModel.itemsIdMap) {
- if (item instanceof ShortcutInfo) {
- ShortcutInfo info = (ShortcutInfo) item;
- if (item.getIntent() != null && info.user.equals(user)) {
- Intent copyIntent = new Intent(item.getIntent());
- copyIntent.setSourceBounds(intent.getSourceBounds());
- String s = copyIntent.toUri(0);
- if (intentWithPkg.equals(s) || intentWithoutPkg.equals(s)) {
- return true;
- }
-
- // checking for existing promise icon with same package name
- if (isLauncherAppTarget
- && info.isPromise()
- && info.hasStatusFlag(ShortcutInfo.FLAG_AUTOINSTALL_ICON)
- && info.getTargetComponent() != null
- && compPkgName != null
- && compPkgName.equals(info.getTargetComponent().getPackageName())) {
- return true;
- }
- }
- }
- }
- }
- return false;
- }
 
 }