commit | 7ce471bdf6d77c9d5778810d9ea033313c579067 | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Wed Aug 02 03:37:39 2017 -0700 |
committer | Sunny Goyal <sunnygoyal@google.com> | Fri Sep 08 14:06:30 2017 -0700 |
tree | 26567ed32b78611f33f9823f7514fbb1f8de821c | |
parent | 17e780794bd10e08405350af8fa1f2fffff79829 [diff] |
Removing support for CustomContent screen The supported way to customize Launcher and add a "-1 page" is by using LauncherOverlays. Custom content screen is no longer supported. Change-Id: I3f8a2734c287d1a69ae0c038ec1de1d45fa1b464
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index a0ad07a..c695758 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -411,7 +411,7 @@ CellLayout layout = (CellLayout) workspace.getPageAt(screenIndex); boolean found = layout.findCellForSpan(outCoordinates, info.spanX, info.spanY); - screenIndex = workspace.hasCustomContent() ? 1 : 0; + screenIndex = 0; while (!found && screenIndex < workspaceScreens.size()) { screenId = workspaceScreens.get(screenIndex); layout = (CellLayout) workspace.getPageAt(screenIndex);
diff --git a/src/com/android/launcher3/accessibility/OverviewScreenAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/OverviewScreenAccessibilityDelegate.java index edb0b16..f9eb2ed 100644 --- a/src/com/android/launcher3/accessibility/OverviewScreenAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/OverviewScreenAccessibilityDelegate.java
@@ -88,7 +88,7 @@ info.addAction(mActions.get(MOVE_FORWARD)); } - int startIndex = mWorkspace.numCustomPages() + (FeatureFlags.QSB_ON_FIRST_SCREEN ? 1 : 0); + int startIndex = FeatureFlags.QSB_ON_FIRST_SCREEN ? 1 : 0; if (index > startIndex) { info.addAction(mActions.get(MOVE_BACKWARD)); }