openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing accessibility arrow 

am: 1dae67b49d

Change-Id: I96a6b2f224ee3c24e4031ea2ec0167d5f3306f37
This commit is contained in:
Sunny Goyal 2019-06-28 14:21:45 -07:00 committed by android-build-merger
parent 73ed3e432c 1dae67b49d
commit 168cb346e5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
View File

@ -81,7 +81,8 @@ public class BackgroundAppState extends OverviewState {
@Override @Override
public int getVisibleElements(Launcher launcher) { public int getVisibleElements(Launcher launcher) {
return super.getVisibleElements(launcher) & ~RECENTS_CLEAR_ALL_BUTTON; return super.getVisibleElements(launcher)
& ~RECENTS_CLEAR_ALL_BUTTON & ~VERTICAL_SWIPE_INDICATOR;
} }
@Override @Override

19
quickstep/src/com/android/quickstep/views/ShelfScrimView.java
View File

@ -15,6 +15,7 @@
*/ */
package com.android.quickstep.views; package com.android.quickstep.views;
import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.LauncherState.BACKGROUND_APP;
import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.ACCEL;
@ -29,6 +30,7 @@ import android.graphics.Paint;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.Path.Direction; import android.graphics.Path.Direction;
import android.graphics.Path.Op; import android.graphics.Path.Op;
import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
@ -36,6 +38,7 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.R; import com.android.launcher3.R;
import com.android.launcher3.Utilities; import com.android.launcher3.Utilities;
import com.android.launcher3.anim.Interpolators; import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.uioverrides.states.OverviewState;
import com.android.launcher3.util.Themes; import com.android.launcher3.util.Themes;
import com.android.launcher3.views.ScrimView; import com.android.launcher3.views.ScrimView;
import com.android.quickstep.SysUINavigationMode; import com.android.quickstep.SysUINavigationMode;
@ -145,14 +148,22 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis
mRemainingScreenPathValid = false; mRemainingScreenPathValid = false;
mShiftRange = mLauncher.getAllAppsController().getShiftRange(); mShiftRange = mLauncher.getAllAppsController().getShiftRange();
mMidProgress = OVERVIEW.getVerticalProgress(mLauncher); if ((OVERVIEW.getVisibleElements(mLauncher) & ALL_APPS_HEADER_EXTRA) == 0) {
mMidAlpha = mMidProgress >= 1 ? 0 mMidProgress = 1;
: Themes.getAttrInteger(getContext(), R.attr.allAppsInterimScrimAlpha); mMidAlpha = 0;
} else {
mMidAlpha = Themes.getAttrInteger(getContext(), R.attr.allAppsInterimScrimAlpha);
Rect hotseatPadding = dp.getHotseatLayoutPadding();
int hotseatSize = dp.hotseatBarSizePx + dp.getInsets().bottom
- hotseatPadding.bottom - hotseatPadding.top;
float arrowTop = Math.min(hotseatSize, OverviewState.getDefaultSwipeHeight(dp));
mMidProgress = 1 - (arrowTop / mShiftRange);
}
mTopOffset = dp.getInsets().top - mShelfOffset; mTopOffset = dp.getInsets().top - mShelfOffset;
mShelfTopAtThreshold = mShiftRange * SCRIM_CATCHUP_THRESHOLD + mTopOffset; mShelfTopAtThreshold = mShiftRange * SCRIM_CATCHUP_THRESHOLD + mTopOffset;
updateColors();
} }
updateColors();
updateDragHandleAlpha(); updateDragHandleAlpha();
invalidate(); invalidate();
} }