Merge "Move IconNormalizer/ShadowGenerator/LauncherIcons to icons package" into ub-launcher3-master
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 8e6703c..8513d63 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -272,8 +272,8 @@
/**
* Overrides the default long press timeout.
*/
- public void setLongPressTimeout(int longPressTimeout) {
- mLongPressHelper.setLongPressTimeout(longPressTimeout);
+ public void setLongPressTimeoutFactor(float longPressTimeoutFactor) {
+ mLongPressHelper.setLongPressTimeoutFactor(longPressTimeoutFactor);
}
@Override
diff --git a/src/com/android/launcher3/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java
index dde733c..639c173 100644
--- a/src/com/android/launcher3/CheckLongPressHelper.java
+++ b/src/com/android/launcher3/CheckLongPressHelper.java
@@ -17,17 +17,18 @@
package com.android.launcher3;
import android.view.View;
+import android.view.ViewConfiguration;
import com.android.launcher3.util.Thunk;
public class CheckLongPressHelper {
- public static final int DEFAULT_LONG_PRESS_TIMEOUT = 300;
+ public static final float DEFAULT_LONG_PRESS_TIMEOUT_FACTOR = 0.75f;
@Thunk View mView;
@Thunk View.OnLongClickListener mListener;
@Thunk boolean mHasPerformedLongPress;
- private int mLongPressTimeout = DEFAULT_LONG_PRESS_TIMEOUT;
+ private float mLongPressTimeoutFactor = DEFAULT_LONG_PRESS_TIMEOUT_FACTOR;
private CheckForLongPress mPendingCheckForLongPress;
class CheckForLongPress implements Runnable {
@@ -60,8 +61,8 @@
/**
* Overrides the default long press timeout.
*/
- public void setLongPressTimeout(int longPressTimeout) {
- mLongPressTimeout = longPressTimeout;
+ public void setLongPressTimeoutFactor(float longPressTimeoutFactor) {
+ mLongPressTimeoutFactor = longPressTimeoutFactor;
}
public void postCheckForLongPress() {
@@ -70,7 +71,8 @@
if (mPendingCheckForLongPress == null) {
mPendingCheckForLongPress = new CheckForLongPress();
}
- mView.postDelayed(mPendingCheckForLongPress, mLongPressTimeout);
+ mView.postDelayed(mPendingCheckForLongPress,
+ (long) (ViewConfiguration.getLongPressTimeout() * mLongPressTimeoutFactor));
}
public void cancelLongPress() {
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 0f13550..69b4bdb 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -22,7 +22,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnFocusChangeListener;
-import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.widget.TextView;
@@ -252,7 +251,7 @@
R.layout.all_apps_icon, parent, false);
icon.setOnClickListener(ItemClickHandler.INSTANCE);
icon.setOnLongClickListener(ItemLongClickListener.INSTANCE_ALL_APPS);
- icon.setLongPressTimeout(ViewConfiguration.getLongPressTimeout());
+ icon.setLongPressTimeoutFactor(1f);
icon.setOnFocusChangeListener(mIconFocusListener);
// Ensure the all apps icon height matches the workspace icons in portrait mode.
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index ba7d9c5..75efea4 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -82,12 +82,17 @@
protected final LauncherInstrumentation mLauncher;
protected Context mTargetContext;
protected String mTargetPackage;
+ protected final boolean mIsInLauncherProcess;
private static final String TAG = "AbstractLauncherUiTest";
protected AbstractLauncherUiTest() {
- mDevice = UiDevice.getInstance(getInstrumentation());
- mLauncher = new LauncherInstrumentation(getInstrumentation());
+ final Instrumentation instrumentation = getInstrumentation();
+ mDevice = UiDevice.getInstance(instrumentation);
+ mLauncher = new LauncherInstrumentation(instrumentation);
+
+ mIsInLauncherProcess = instrumentation.getTargetContext().getPackageName().equals(
+ mDevice.getLauncherPackageName());
}
@Rule
@@ -261,6 +266,7 @@
}
protected <T> T getFromLauncher(Function<Launcher, T> f) {
+ if (!mIsInLauncherProcess) return null;
return getOnUiThread(() -> f.apply(mActivityMonitor.getActivity()));
}
@@ -287,6 +293,7 @@
// flakiness.
protected boolean waitForLauncherCondition(
Function<Launcher, Boolean> condition, long timeout) {
+ if (!mIsInLauncherProcess) return true;
return Wait.atMost(() -> getFromLauncher(condition), timeout);
}
diff --git a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java
index 23560e8..a50a8b1 100644
--- a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java
+++ b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java
@@ -42,7 +42,8 @@
LauncherActivityInfo settingsApp = getSettingsApp();
clearHomescreen();
- mActivityMonitor.startLauncher();
+ mDevice.pressHome();
+ mDevice.waitForIdle();
// Open all apps and wait for load complete.
final UiObject2 appsContainer = openAllApps();