PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge changes from topic 'am-8fe17af0-0537-403b-a1b4-6a352a5e7ce7' into ub-launcher3-dorval-polish2

Browse Source 
* changes:
  Collapse caret click and all apps click into one am: bf78f3cd41
  Collapse caret click and all apps click into one
This commit is contained in:
TreeHugger Robot
2017-07-14 23:26:42 +00:00
committed by Android (Google) Code Review
parent c38dde8fc0 49b420f7c4
commit 030387e517
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+5 -19
View File
@@ -2256,9 +2256,8 @@ public class Launcher extends BaseActivity
if (v instanceof FolderIcon) {
onClickFolderIcon(v);
}
} else if ((FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && v instanceof PageIndicator)) {
onClickAllAppsCaret(v);
} else if (v == mAllAppsButton && mAllAppsButton != null) {
} else if ((FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && v instanceof PageIndicator) ||
(v == mAllAppsButton && mAllAppsButton != null)) {
onClickAllAppsButton(v);
} else if (tag instanceof AppInfo) {
startAppShortcutOrInfoActivity(v);
@@ -2309,27 +2308,14 @@ public class Launcher extends BaseActivity
}
/**
* Event handler for the "grid" button that appears on the home screen, which
* enters all apps mode.
* Event handler for the "grid" button or "caret" that appears on the home screen, which
* enters all apps mode. In verticalBarLayout the caret can be seen when all apps is open, and
* so in that case reverses the action.
*
* @param v The view that was clicked.
*/
protected void onClickAllAppsButton(View v) {
if (LOGD) Log.d(TAG, "onClickAllAppsButton");
if (!isAppsViewVisible()) {
getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
ControlType.ALL_APPS_BUTTON);
showAppsView(true /* animated */, true /* updatePredictedApps */);
}
}
/**
* Event handler for the swipe up caret
*
* @param v The view that was clicked.
*/
protected void onClickAllAppsCaret(View v) {
if (LOGD) Log.d(TAG, "onClickAllAppsCaret");
if (!isAppsViewVisible()) {
getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
ControlType.ALL_APPS_BUTTON);