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

Merge "Revert "Removed disabled overview actions at end of scroll"" into tm-qpr-dev am: 5db9942c61

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20293338

Change-Id: I58477e96b37b2b3104837b232550dc2ff60d9690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Saumya Prakash
2022-10-26 22:36:14 +00:00
committed by Automerger Merge Worker
parent de2172bedf 5db9942c61
commit ccb46bd18f
4 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/ClearAllButton.java
-4
View File
@@ -99,10 +99,6 @@ public class ClearAllButton extends Button {
return false;
}
public float getScrollAlpha() {
return mScrollAlpha;
}
public void setContentAlpha(float alpha) {
if (mContentAlpha != alpha) {
mContentAlpha = alpha;
quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+1 -7
View File
@@ -82,8 +82,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
private static final int INDEX_FULLSCREEN_ALPHA = 2;
private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3;
private static final int INDEX_SHARE_TARGET_ALPHA = 4;
private static final int INDEX_SCROLL_ALPHA = 5;
private static final int NUM_ALPHAS = 6;
public @interface SplitButtonHiddenFlags { }
public static final int FLAG_IS_NOT_TABLET = 1 << 0;
@@ -128,7 +126,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
@Override
protected void onFinishInflate() {
super.onFinishInflate();
mMultiValueAlpha = new MultiValueAlpha(findViewById(R.id.action_buttons), NUM_ALPHAS);
mMultiValueAlpha = new MultiValueAlpha(findViewById(R.id.action_buttons), 5);
mMultiValueAlpha.setUpdateVisibility(true);
findViewById(R.id.action_screenshot).setOnClickListener(this);
@@ -249,10 +247,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
return mMultiValueAlpha.get(INDEX_SHARE_TARGET_ALPHA);
}
public AlphaProperty getIndexScrollAlpha() {
return mMultiValueAlpha.getProperty(INDEX_SCROLL_ALPHA);
}
/**
* Offsets OverviewActionsView horizontal position based on 3 button nav container in taskbar.
*/
quickstep/src/com/android/quickstep/views/RecentsView.java
-3
View File
@@ -1913,9 +1913,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
}
int scroll = mOrientationHandler.getPrimaryScroll(this);
mClearAllButton.onRecentsViewScroll(scroll, mOverviewGridEnabled);
// Clear all button alpha was set by the previous line.
mActionsView.getIndexScrollAlpha().setValue(1 - mClearAllButton.getScrollAlpha());
}
@Override