diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-18 18:56:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-18 18:56:28 +0000 |
commit | 58253eaac87db34367d1fb90958ce1c9e1882394 (patch) | |
tree | 24fb3f0614667c95f788aa459f129efeceb5a4a6 /src | |
parent | e973b032e4ab64725e341b6eb237c60f6d494edd (diff) | |
parent | 6d2321cb7dfe4eb72ee7bd52b1ee8d3a238ab865 (diff) | |
download | packages_apps_Trebuchet-58253eaac87db34367d1fb90958ce1c9e1882394.tar.gz packages_apps_Trebuchet-58253eaac87db34367d1fb90958ce1c9e1882394.tar.bz2 packages_apps_Trebuchet-58253eaac87db34367d1fb90958ce1c9e1882394.zip |
Merge "Introducing Clear-all button on Overview" into ub-launcher3-edmonton
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 88408606f..ec0a8ffb3 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -18,6 +18,7 @@ package com.android.launcher3; import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION; import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE; + import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; @@ -205,6 +206,8 @@ public class Launcher extends BaseDraggingActivity // UI and state for the overview panel private View mOverviewPanel; + private View mOverviewPanelContainer; + @Thunk boolean mWorkspaceLoading = true; private OnResumeCallback mOnResumeCallback; @@ -912,6 +915,7 @@ public class Launcher extends BaseDraggingActivity mWorkspace = mDragLayer.findViewById(R.id.workspace); mWorkspace.initParentViews(mDragLayer); mOverviewPanel = findViewById(R.id.overview_panel); + mOverviewPanelContainer = findViewById(R.id.overview_panel_container); mHotseat = findViewById(R.id.hotseat); mDragHandleIndicator = findViewById(R.id.drag_indicator); mHotseatSearchBox = findViewById(R.id.search_container_hotseat); @@ -1192,6 +1196,10 @@ public class Launcher extends BaseDraggingActivity return (T) mOverviewPanel; } + public <T extends View> T getOverviewPanelContainer() { + return (T) mOverviewPanelContainer; + } + public DropTargetBar getDropTargetBar() { return mDropTargetBar; } |