aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename flag IS_DOGFOOD to IS_STUDIO.

Browse Source 
The flag is only set when building from Android Studio... and is never
used for dogfood.

Test: local
Change-Id: I898d585f4558c2437f0152ef102bea59c351f80b
This commit is contained in:
Zak Cohen
2020-02-14 14:15:13 -08:00
parent a7c931dd49
commit 3eeb41de9a
22 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/Workspace.java
View File

@@ -1858,7 +1858,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
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<WorkspacePageIndicator>
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<WorkspacePageIndicator>
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<WorkspacePageIndicator>
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