diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 6958633cda..7da31cd7c6 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -93,7 +93,6 @@ import android.widget.TextView; import android.widget.Toast; import com.android.launcher3.DropTarget.DragObject; -import com.android.launcher3.PagedView.PageSwitchListener; import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.DefaultAppSearchController; import com.android.launcher3.compat.AppWidgetManagerCompat; @@ -139,7 +138,7 @@ import java.util.Locale; */ public class Launcher extends Activity implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks, - View.OnTouchListener, PageSwitchListener, LauncherProviderChangeListener, + View.OnTouchListener, LauncherProviderChangeListener, AccessibilityManager.AccessibilityStateChangeListener { public static final String TAG = "Launcher"; static final boolean LOGD = false; @@ -1347,7 +1346,6 @@ public class Launcher extends Activity mFocusHandler = (FocusIndicatorView) findViewById(R.id.focus_indicator); mDragLayer = (DragLayer) findViewById(R.id.drag_layer); mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace); - mWorkspace.setPageSwitchListener(this); mPageIndicators = mDragLayer.findViewById(R.id.page_indicator); mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN @@ -2596,10 +2594,6 @@ public class Launcher extends Activity if (!isAppsViewVisible()) { showAppsView(true /* animated */, false /* resetListToTop */, true /* updatePredictedApps */, false /* focusSearchBar */); - - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onClickAllAppsButton(v); - } } } @@ -2673,10 +2667,6 @@ public class Launcher extends Activity // Start activities startAppShortcutOrInfoActivity(v); - - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onClickAppShortcut(v); - } } @Thunk void startAppShortcutOrInfoActivity(View v) { @@ -2723,10 +2713,6 @@ public class Launcher extends Activity // Open the requested folder openFolder(folderIcon); } - - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onClickFolderIcon(v); - } } /** @@ -2739,9 +2725,6 @@ public class Launcher extends Activity Toast.makeText(this, R.string.safemode_widget_error, Toast.LENGTH_SHORT).show(); } else { showWidgetsView(true /* animated */, true /* resetPageToZero */); - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onClickAddWidgetButton(view); - } } } @@ -2796,10 +2779,6 @@ public class Launcher extends Activity // content screen, move to default. moveWorkspaceToDefaultScreen(); } - - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onDragStarted(view); - } } /** @@ -4418,9 +4397,6 @@ public class Launcher extends Activity } protected boolean isLauncherPreinstalled() { - if (mLauncherCallbacks != null) { - return mLauncherCallbacks.isLauncherPreinstalled(); - } PackageManager pm = getPackageManager(); try { ApplicationInfo ai = pm.getApplicationInfo(getComponentName().getPackageName(), 0); @@ -4626,13 +4602,6 @@ public class Launcher extends Activity mWorkspace.moveToDefaultScreen(false); } - @Override - public void onPageSwitch(View newPage, int newPageIndex) { - if (mLauncherCallbacks != null) { - mLauncherCallbacks.onPageSwitch(newPage, newPageIndex); - } - } - /** * Returns a FastBitmapDrawable with the icon, accurately sized. */ diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java index f33cf83e84..32ecdf64e7 100644 --- a/src/com/android/launcher3/LauncherCallbacks.java +++ b/src/com/android/launcher3/LauncherCallbacks.java @@ -60,35 +60,14 @@ public interface LauncherCallbacks { public void onInteractionBegin(); public void onInteractionEnd(); - /** - * Extension points for Gel Logging. - */ - @Deprecated - public void onClickAllAppsButton(View v); - @Deprecated - public void onClickFolderIcon(View v); - @Deprecated - public void onClickAppShortcut(View v); - @Deprecated - public void onClickPagedViewIcon(View v); - @Deprecated - public void onClickWallpaperPicker(View v); @Deprecated public void onClickSettingsButton(View v); @Deprecated - public void onClickAddWidgetButton(View v); - @Deprecated - public void onPageSwitch(View newPage, int newPageIndex); - @Deprecated public void onWorkspaceLockedChanged(); - @Deprecated - public void onDragStarted(View view); public boolean providesSearch(); public boolean startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData, Rect sourceBounds); - @Deprecated - public boolean startSearchFromAllApps(String query); public boolean hasCustomContentToLeft(); public void populateCustomContentContainer(); public View getQsbBar(); @@ -104,9 +83,6 @@ public interface LauncherCallbacks { public View getIntroScreen(); public boolean shouldMoveToDefaultScreenOnHomeIntent(); public boolean hasSettings(); - @Deprecated - public boolean overrideWallpaperDimensions(); - public boolean isLauncherPreinstalled(); public AllAppsSearchBarController getAllAppsSearchBarController(); public List getPredictedApps(); public static final int SEARCH_BAR_HEIGHT_NORMAL = 0, SEARCH_BAR_HEIGHT_TALL = 1; diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 5606a244d5..6f7566f107 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -142,8 +142,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected int mActivePointerId = INVALID_POINTER; - private PageSwitchListener mPageSwitchListener; - // If true, modify alpha of neighboring pages as user scrolls left/right protected boolean mFadeInAdjacentScreens = false; @@ -195,10 +193,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private final LauncherEdgeEffect mEdgeGlowLeft = new LauncherEdgeEffect(); private final LauncherEdgeEffect mEdgeGlowRight = new LauncherEdgeEffect(); - public interface PageSwitchListener { - void onPageSwitch(View newPage, int newPageIndex); - } - public PagedView(Context context) { this(context, null); } @@ -364,17 +358,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return new PageIndicator.PageMarkerResources(); } - /** - * Add a page change listener which will be called when a page is _finished_ listening. - * - */ - public void setPageSwitchListener(PageSwitchListener pageSwitchListener) { - mPageSwitchListener = pageSwitchListener; - if (mPageSwitchListener != null) { - mPageSwitchListener.onPageSwitch(getPageAt(mCurrentPage), mCurrentPage); - } - } - /** * Returns the index of the currently displayed page. When in free scroll mode, this is the page * that the user was on before entering free scroll mode (e.g. the home screen page they @@ -484,10 +467,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc * has settled. */ protected void notifyPageSwitchListener() { - if (mPageSwitchListener != null) { - mPageSwitchListener.onPageSwitch(getPageAt(getNextPage()), getNextPage()); - } - updatePageIndicator(); } diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java index 2fde8f3e46..0f8391cf2f 100644 --- a/src/com/android/launcher3/testing/LauncherExtension.java +++ b/src/com/android/launcher3/testing/LauncherExtension.java @@ -122,50 +122,18 @@ public class LauncherExtension extends Launcher { public void finishBindingItems(boolean upgradePath) { } - @Override - public void onClickAllAppsButton(View v) { - } - @Override public void bindAllApplications(ArrayList apps) { } - @Override - public void onClickFolderIcon(View v) { - } - - @Override - public void onClickAppShortcut(View v) { - } - - @Override - public void onClickPagedViewIcon(View v) { - } - - @Override - public void onClickWallpaperPicker(View v) { - } - @Override public void onClickSettingsButton(View v) { } - @Override - public void onClickAddWidgetButton(View v) { - } - - @Override - public void onPageSwitch(View newPage, int newPageIndex) { - } - @Override public void onWorkspaceLockedChanged() { } - @Override - public void onDragStarted(View view) { - } - @Override public void onInteractionBegin() { } @@ -185,11 +153,6 @@ public class LauncherExtension extends Launcher { return false; } - @Override - public boolean startSearchFromAllApps(String query) { - return false; - } - CustomContentCallbacks mCustomContentCallbacks = new CustomContentCallbacks() { // Custom content is completely shown. {@code fromResume} indicates whether this was caused @@ -268,11 +231,6 @@ public class LauncherExtension extends Launcher { return false; } - @Override - public boolean overrideWallpaperDimensions() { - return false; - } - @Override public AllAppsSearchBarController getAllAppsSearchBarController() { return null; @@ -289,11 +247,6 @@ public class LauncherExtension extends Launcher { return SEARCH_BAR_HEIGHT_NORMAL; } - @Override - public boolean isLauncherPreinstalled() { - return false; - } - @Override public void setLauncherSearchCallback(Object callbacks) { // Do nothing @@ -305,6 +258,6 @@ public class LauncherExtension extends Launcher { @Override public void onDetachedFromWindow() { - }; + } } }