28a8b9f158
Check the size of the scrim and draw on the bottom of AllApps and Widgets. Add a padding to the bottom of AllApps and Widgets so content is above the scrim. Change the color of nav buttons for better accessibility. Correct width of the Widgets sheets to be the same as AllApps sheet. Fixes: 221107977 Fixes: 214215594 Test: manual, HSV and Window Change-Id: Ib7510ffcd80231de7fefcdef65b422174dd74593
73 lines
2.3 KiB
Java
73 lines
2.3 KiB
Java
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.allapps;
|
|
|
|
import android.content.Context;
|
|
import android.util.AttributeSet;
|
|
import android.view.MotionEvent;
|
|
import android.view.WindowInsets;
|
|
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.LauncherState;
|
|
import com.android.launcher3.Utilities;
|
|
|
|
/**
|
|
* AllAppsContainerView with launcher specific callbacks
|
|
*/
|
|
public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<Launcher> {
|
|
|
|
public LauncherAllAppsContainerView(Context context) {
|
|
this(context, null);
|
|
}
|
|
|
|
public LauncherAllAppsContainerView(Context context, AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public LauncherAllAppsContainerView(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
super(context, attrs, defStyleAttr);
|
|
}
|
|
|
|
@Override
|
|
public boolean onInterceptTouchEvent(MotionEvent ev) {
|
|
// The AllAppsContainerView houses the QSB and is hence visible from the Workspace
|
|
// Overview states. We shouldn't intercept for the scrubber in these cases.
|
|
if (!mActivityContext.isInState(LauncherState.ALL_APPS)) {
|
|
mTouchHandler = null;
|
|
return false;
|
|
}
|
|
|
|
return super.onInterceptTouchEvent(ev);
|
|
}
|
|
|
|
@Override
|
|
public boolean onTouchEvent(MotionEvent ev) {
|
|
if (!mActivityContext.isInState(LauncherState.ALL_APPS)) {
|
|
return false;
|
|
}
|
|
return super.onTouchEvent(ev);
|
|
}
|
|
|
|
@Override
|
|
protected int getNavBarScrimHeight(WindowInsets insets) {
|
|
if (Utilities.ATLEAST_Q) {
|
|
return insets.getTappableElementInsets().bottom;
|
|
} else {
|
|
return insets.getStableInsetBottom();
|
|
}
|
|
}
|
|
}
|