diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java index f82af62aac..834e6cf0fb 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java @@ -296,7 +296,7 @@ public class PredictionRowView extends LinearLayout implements predictedApp.container = LauncherSettings.Favorites.CONTAINER_PREDICTION; predictedApps.add(predictedApp); } else { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { Log.e(TAG, "Predicted app not found: " + mapper); } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index 321af6c7ba..ef1698e193 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -1251,7 +1251,7 @@ public abstract class RecentsView extends PagedView impl } public PendingAnimation createAllTasksDismissAnimation(long duration) { - if (FeatureFlags.IS_DOGFOOD_BUILD && mPendingAnimation != null) { + if (FeatureFlags.IS_STUDIO_BUILD && mPendingAnimation != null) { throw new IllegalStateException("Another pending animation is still running"); } AnimatorSet anim = new AnimatorSet(); @@ -1595,7 +1595,7 @@ public abstract class RecentsView extends PagedView impl } public PendingAnimation createTaskLauncherAnimation(TaskView tv, long duration) { - if (FeatureFlags.IS_DOGFOOD_BUILD && mPendingAnimation != null) { + if (FeatureFlags.IS_STUDIO_BUILD && mPendingAnimation != null) { throw new IllegalStateException("Another pending animation is still running"); } diff --git a/quickstep/src/com/android/quickstep/MultiStateCallback.java b/quickstep/src/com/android/quickstep/MultiStateCallback.java index 6c65e01c20..b3875aef52 100644 --- a/quickstep/src/com/android/quickstep/MultiStateCallback.java +++ b/quickstep/src/com/android/quickstep/MultiStateCallback.java @@ -130,7 +130,7 @@ public class MultiStateCallback { final LinkedList callbacks; if (mCallbacks.indexOfKey(stateMask) >= 0) { callbacks = mCallbacks.get(stateMask); - if (FeatureFlags.IS_DOGFOOD_BUILD && callbacks.contains(callback)) { + if (FeatureFlags.IS_STUDIO_BUILD && callbacks.contains(callback)) { throw new IllegalStateException("Existing callback for state found"); } } else { diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index c362e52652..6902e37613 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -55,7 +55,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn // Notify if recents animation is still running if (mController != null) { String msg = "New recents animation started before old animation completed"; - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { throw new IllegalArgumentException(msg); } else { Log.e("TaskAnimationManager", msg, new Exception()); diff --git a/quickstep/src/com/android/quickstep/util/BinderTracker.java b/quickstep/src/com/android/quickstep/util/BinderTracker.java index 32d0d53779..cb04e5b015 100644 --- a/quickstep/src/com/android/quickstep/util/BinderTracker.java +++ b/quickstep/src/com/android/quickstep/util/BinderTracker.java @@ -31,7 +31,7 @@ public class BinderTracker { private static final String TAG = "BinderTracker"; public static void start() { - if (!FeatureFlags.IS_DOGFOOD_BUILD) { + if (!FeatureFlags.IS_STUDIO_BUILD) { Log.wtf(TAG, "Accessing tracker in released code.", new Exception()); return; } @@ -40,7 +40,7 @@ public class BinderTracker { } public static void stop() { - if (!FeatureFlags.IS_DOGFOOD_BUILD) { + if (!FeatureFlags.IS_STUDIO_BUILD) { Log.wtf(TAG, "Accessing tracker in released code.", new Exception()); return; } diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index ac61c49a84..8718820bd2 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -538,7 +538,7 @@ public class CellLayout extends ViewGroup implements Transposable { try { dispatchRestoreInstanceState(states); } catch (IllegalArgumentException ex) { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { throw ex; } // Mismatched viewId / viewType preventing restore. Skip restore on production builds. diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index 466b7b242f..f07040db03 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -96,7 +96,7 @@ public class FocusHelper { } if (!(v.getParent() instanceof ShortcutAndWidgetContainer)) { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { throw new IllegalStateException("Parent of the focused item is not supported."); } else { return false; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 397a38bbe3..3a275ff3a5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2144,7 +2144,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, Object tag = v.getTag(); String desc = "Collision while binding workspace item: " + item + ". Collides with " + tag; - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { throw (new RuntimeException(desc)); } else { Log.d(TAG, desc); diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 4cd038d42e..d77285d7be 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -91,7 +91,7 @@ public class LauncherAppState { Intent.ACTION_MANAGED_PROFILE_AVAILABLE, Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE, Intent.ACTION_MANAGED_PROFILE_UNLOCKED); - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { mModelChangeReceiver.register(mContext, ACTION_FORCE_ROLOAD); } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index bb6c330549..ac0fef80e2 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -17,7 +17,7 @@ package com.android.launcher3; import static com.android.launcher3.LauncherAppState.ACTION_FORCE_ROLOAD; -import static com.android.launcher3.config.FeatureFlags.IS_DOGFOOD_BUILD; +import static com.android.launcher3.config.FeatureFlags.IS_STUDIO_BUILD; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission; @@ -55,7 +55,6 @@ import com.android.launcher3.pm.InstallSessionTracker; import com.android.launcher3.pm.PackageInstallInfo; import com.android.launcher3.pm.UserCache; import com.android.launcher3.shortcuts.ShortcutRequest; -import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.LooperExecutor; @@ -250,7 +249,7 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi enqueueModelUpdateTask(new UserLockStateChangedTask(user)); } } - } else if (IS_DOGFOOD_BUILD && ACTION_FORCE_ROLOAD.equals(action)) { + } else if (IS_STUDIO_BUILD && ACTION_FORCE_ROLOAD.equals(action)) { for (Callbacks cb : getCallbacks()) { if (cb instanceof Launcher) { ((Launcher) cb).recreate(); diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 5544240f57..697048a0da 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -119,7 +119,7 @@ public class LauncherProvider extends ContentProvider { @Override public boolean onCreate() { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { Log.d(TAG, "Launcher process started"); } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index ae4eae9179..4c6e1f3ebc 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1502,7 +1502,7 @@ public abstract class PagedView extends ViewGrou return false; } - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { duration *= Settings.Global.getFloat(getContext().getContentResolver(), Settings.Global.WINDOW_ANIMATION_SCALE, 1); } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index b7f8547155..a8f492f623 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1858,7 +1858,7 @@ public class Workspace extends PagedView CellLayout parentCell = getParentCellLayoutForView(cell); if (parentCell != null) { parentCell.removeView(cell); - } else if (FeatureFlags.IS_DOGFOOD_BUILD) { + } else if (FeatureFlags.IS_STUDIO_BUILD) { throw new NullPointerException("mDragInfo.cell has null parent"); } addInScreen(cell, container, screenId, mTargetCell[0], mTargetCell[1], @@ -2153,7 +2153,7 @@ public class Workspace extends PagedView ItemInfo item = d.dragInfo; if (item == null) { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { throw new NullPointerException("DragObject has null info"); } return; @@ -2775,7 +2775,7 @@ public class Workspace extends PagedView mDragInfo.container, mDragInfo.screenId); if (cellLayout != null) { cellLayout.onDropChild(mDragInfo.cell); - } else if (FeatureFlags.IS_DOGFOOD_BUILD) { + } else if (FeatureFlags.IS_STUDIO_BUILD) { throw new RuntimeException("Invalid state: cellLayout == null in " + "Workspace#onDropCompleted. Please file a bug. "); } @@ -2794,7 +2794,7 @@ public class Workspace extends PagedView CellLayout parentCell = getParentCellLayoutForView(v); if (parentCell != null) { parentCell.removeView(v); - } else if (FeatureFlags.IS_DOGFOOD_BUILD) { + } else if (FeatureFlags.IS_STUDIO_BUILD) { // When an app is uninstalled using the drop target, we wait until resume to remove // the icon. We also remove all the corresponding items from the workspace at // {@link Launcher#bindComponentsRemoved}. That call can come before or after diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index ea549b9077..641304403e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -43,7 +43,10 @@ public final class FeatureFlags { return Utilities.IS_DEBUG_DEVICE && Utilities.isDevelopersOptionsEnabled(context); } - public static final boolean IS_DOGFOOD_BUILD = BuildConfig.DEBUG; + /** + * True when the build has come from Android Studio and is being used for local debugging. + */ + public static final boolean IS_STUDIO_BUILD = BuildConfig.DEBUG; /** * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 1d315ddd79..1b45f10c33 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -629,7 +629,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo dragLayer.addView(this); mDragController.addDropTarget(this); } else { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { Log.e(TAG, "Opening folder (" + this + ") which already has a parent:" + getParent()); } diff --git a/src/com/android/launcher3/graphics/DragPreviewProvider.java b/src/com/android/launcher3/graphics/DragPreviewProvider.java index f579451971..94d30f69c3 100644 --- a/src/com/android/launcher3/graphics/DragPreviewProvider.java +++ b/src/com/android/launcher3/graphics/DragPreviewProvider.java @@ -152,7 +152,7 @@ public class DragPreviewProvider { } public final void generateDragOutline(Bitmap preview) { - if (FeatureFlags.IS_DOGFOOD_BUILD && mOutlineGeneratorCallback != null) { + if (FeatureFlags.IS_STUDIO_BUILD && mOutlineGeneratorCallback != null) { throw new RuntimeException("Drag outline generated twice"); } diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java index c24b9397d8..32fce0b5a3 100644 --- a/src/com/android/launcher3/model/BgDataModel.java +++ b/src/com/android/launcher3/model/BgDataModel.java @@ -273,7 +273,7 @@ public class BgDataModel { switch (item.itemType) { case LauncherSettings.Favorites.ITEM_TYPE_FOLDER: folders.remove(item.id); - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { for (ItemInfo info : itemsIdMap) { if (info.container == item.id) { // We are deleting a folder which still contains items that diff --git a/src/com/android/launcher3/model/ModelUtils.java b/src/com/android/launcher3/model/ModelUtils.java index 628dd95c41..1473124fdf 100644 --- a/src/com/android/launcher3/model/ModelUtils.java +++ b/src/com/android/launcher3/model/ModelUtils.java @@ -97,7 +97,7 @@ public class ModelUtils { return Integer.compare(lhs.screenId, rhs.screenId); } default: - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { throw new RuntimeException( "Unexpected container type when sorting workspace items."); } diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java index ccd1554b23..27fa580154 100644 --- a/src/com/android/launcher3/model/ModelWriter.java +++ b/src/com/android/launcher3/model/ModelWriter.java @@ -115,8 +115,9 @@ public class ModelWriter { ItemInfo modelItem = mBgDataModel.itemsIdMap.get(itemId); if (modelItem != null && item != modelItem) { // check all the data is consistent - if (!Utilities.IS_DEBUG_DEVICE && !FeatureFlags.IS_DOGFOOD_BUILD && - modelItem instanceof WorkspaceItemInfo && item instanceof WorkspaceItemInfo) { + if (!Utilities.IS_DEBUG_DEVICE && !FeatureFlags.IS_STUDIO_BUILD + && modelItem instanceof WorkspaceItemInfo + && item instanceof WorkspaceItemInfo) { if (modelItem.title.toString().equals(item.title.toString()) && modelItem.getIntent().filterEquals(item.getIntent()) && modelItem.id == item.id && @@ -320,7 +321,7 @@ public class ModelWriter { */ public void prepareToUndoDelete() { if (!mPreparingToUndo) { - if (!mDeleteRunnables.isEmpty() && FeatureFlags.IS_DOGFOOD_BUILD) { + if (!mDeleteRunnables.isEmpty() && FeatureFlags.IS_STUDIO_BUILD) { throw new IllegalStateException("There are still uncommitted delete operations!"); } mDeleteRunnables.clear(); diff --git a/src/com/android/launcher3/util/IOUtils.java b/src/com/android/launcher3/util/IOUtils.java index 4a4a5ca22e..fcb96d7db5 100644 --- a/src/com/android/launcher3/util/IOUtils.java +++ b/src/com/android/launcher3/util/IOUtils.java @@ -19,7 +19,6 @@ package com.android.launcher3.util; import android.content.Context; import android.util.Log; -import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; import java.io.ByteArrayOutputStream; @@ -67,7 +66,7 @@ public class IOUtils { * Utility method to debug binary data */ public static String createTempFile(Context context, byte[] data) { - if (!FeatureFlags.IS_DOGFOOD_BUILD) { + if (!FeatureFlags.IS_STUDIO_BUILD) { throw new IllegalStateException("Method only allowed in development mode"); } @@ -87,7 +86,7 @@ public class IOUtils { try { c.close(); } catch (IOException e) { - if (FeatureFlags.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_STUDIO_BUILD) { Log.d(TAG, "Error closing", e); } } diff --git a/src/com/android/launcher3/util/Preconditions.java b/src/com/android/launcher3/util/Preconditions.java index ed66422be0..63d56e47ee 100644 --- a/src/com/android/launcher3/util/Preconditions.java +++ b/src/com/android/launcher3/util/Preconditions.java @@ -28,25 +28,25 @@ import com.android.launcher3.config.FeatureFlags; public class Preconditions { public static void assertNotNull(Object o) { - if (FeatureFlags.IS_DOGFOOD_BUILD && o == null) { + if (FeatureFlags.IS_STUDIO_BUILD && o == null) { throw new IllegalStateException(); } } public static void assertWorkerThread() { - if (FeatureFlags.IS_DOGFOOD_BUILD && !isSameLooper(MODEL_EXECUTOR.getLooper())) { + if (FeatureFlags.IS_STUDIO_BUILD && !isSameLooper(MODEL_EXECUTOR.getLooper())) { throw new IllegalStateException(); } } public static void assertUIThread() { - if (FeatureFlags.IS_DOGFOOD_BUILD && !isSameLooper(Looper.getMainLooper())) { + if (FeatureFlags.IS_STUDIO_BUILD && !isSameLooper(Looper.getMainLooper())) { throw new IllegalStateException(); } } public static void assertNonUiThread() { - if (FeatureFlags.IS_DOGFOOD_BUILD && isSameLooper(Looper.getMainLooper())) { + if (FeatureFlags.IS_STUDIO_BUILD && isSameLooper(Looper.getMainLooper())) { throw new IllegalStateException(); } } diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java index 5ebf8d397f..282867accf 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java @@ -115,7 +115,7 @@ public class WidgetsModel { } setWidgetsAndShortcuts(widgetsAndShortcuts, app, packageUser); } catch (Exception e) { - if (!FeatureFlags.IS_DOGFOOD_BUILD && Utilities.isBinderSizeError(e)) { + if (!FeatureFlags.IS_STUDIO_BUILD && Utilities.isBinderSizeError(e)) { // the returned value may be incomplete and will not be refreshed until the next // time Launcher starts. // TODO: after figuring out a repro step, introduce a dirty bit to check when