Fixing some tests for 2-button mode

Bug: 141315387
Change-Id: I66db3e790f5fbe6bc30999ed599cce03874509be
This commit is contained in:
Sunny Goyal
2019-09-20 09:37:11 -07:00
parent 151fddfb71
commit 3d56046ff8
9 changed files with 66 additions and 80 deletions

View File

@@ -21,7 +21,6 @@ import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Bundle;
import android.os.Process;
import android.text.Selection;
import android.text.SpannableStringBuilder;
@@ -33,6 +32,13 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.WindowInsets;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.dynamicanimation.animation.DynamicAnimation;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.android.launcher3.AppInfo;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
@@ -45,9 +51,7 @@ import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.compat.AccessibilityManagerCompat;
import com.android.launcher3.keyboard.FocusedItemDecorator;
import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
import com.android.launcher3.util.ItemInfoMatcher;
@@ -58,13 +62,6 @@ import com.android.launcher3.views.BottomUserEducationView;
import com.android.launcher3.views.RecyclerViewFastScroller;
import com.android.launcher3.views.SpringRelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.dynamicanimation.animation.DynamicAnimation;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* The all apps view container.
*/
@@ -612,17 +609,4 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
&& verticalFadingEdge);
}
}
@Override
public boolean performAccessibilityAction(int action, Bundle arguments) {
if (AccessibilityManagerCompat.processTestRequest(
mLauncher, TestProtocol.GET_SCROLL_MESSAGE, action, arguments,
response ->
response.putInt(TestProtocol.SCROLL_Y_FIELD,
getActiveRecyclerView().getCurrentScrollY()))) {
return true;
}
return super.performAccessibilityAction(action, arguments);
}
}