diff --git a/res/layout/secondary_launcher.xml b/res/layout/secondary_launcher.xml index b15a320bba..1a7827244f 100644 --- a/res/layout/secondary_launcher.xml +++ b/res/layout/secondary_launcher.xml @@ -29,7 +29,7 @@ android:layout_margin="@dimen/dynamic_grid_edge_margin" android:id="@+id/workspace_grid" /> - + android:onClick="onAppsButtonClicked" /> --> deepShortcutMap) { diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java index 1820933509..05307f26ed 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java @@ -45,7 +45,6 @@ import java.util.Collections; */ public class SecondaryDragLayer extends BaseDragLayer { - private View mAllAppsButton; private AllAppsContainerView mAppsView; private GridView mWorkspace; @@ -67,7 +66,6 @@ public class SecondaryDragLayer extends BaseDragLayer @Override protected void onFinishInflate() { super.onFinishInflate(); - mAllAppsButton = findViewById(R.id.all_apps_button); mAppsView = findViewById(R.id.apps_view); mAppsView.setOnIconLongClickListener(this::onIconLongClicked); @@ -124,10 +122,6 @@ public class SecondaryDragLayer extends BaseDragLayer mAppsView.measure( makeMeasureSpec(appsWidth, EXACTLY), makeMeasureSpec(appsHeight, EXACTLY)); - } else if (child == mAllAppsButton) { - int appsButtonSpec = makeMeasureSpec(grid.iconSizePx, EXACTLY); - mAllAppsButton.measure(appsButtonSpec, appsButtonSpec); - } else if (child == mWorkspace) { measureChildWithMargins(mWorkspace, widthMeasureSpec, 0, heightMeasureSpec, grid.iconSizePx + grid.edgeMarginPx); @@ -157,7 +151,7 @@ public class SecondaryDragLayer extends BaseDragLayer if (ev.getAction() == MotionEvent.ACTION_DOWN && !isEventOverView(mActivity.getAppsView(), ev)) { - mActivity.showAppDrawer(false); + //mActivity.showAppDrawer(false); return true; } return false;