aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't wait until layout to calculate the scroll range

Browse Source 
State UI is based on scroll range, which is applied on insets change.
So the scroll range should be updated as part of insets change, for the State
UI to be applied properly

Bug: 77220795
Change-Id: I839f89e4887d9731b1483135724227c4245a00a9
This commit is contained in:
Sunny Goyal
2018-03-28 13:17:32 -07:00
parent 71d45a0ab0
commit 8c1a935a45
3 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
View File

@@ -23,10 +23,6 @@ import static com.android.launcher3.graphics.IconNormalizer.ICON_VISIBLE_AREA_FA
import android.content.Context;
import android.graphics.Rect;
import android.support.animation.FloatValueHolder;
import android.support.animation.SpringAnimation;
import android.support.animation.SpringForce;
import android.support.annotation.NonNull;
import android.text.Selection;
import android.text.Spannable;
import android.text.SpannableString;
@@ -39,6 +35,7 @@ import android.view.ViewGroup.MarginLayoutParams;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.ExtendedEditText;
import com.android.launcher3.Insettable;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.allapps.AllAppsContainerView;
@@ -55,7 +52,7 @@ import java.util.ArrayList;
*/
public class AppsSearchContainerLayout extends ExtendedEditText
implements SearchUiManager, AllAppsSearchBarController.Callbacks,
AllAppsStore.OnUpdateListener {
AllAppsStore.OnUpdateListener, Insettable {
private final Launcher mLauncher;
@@ -64,7 +61,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText
private AlphabeticalAppsList mApps;
private AllAppsContainerView mAppsView;
private SpringAnimation mSpring;
public AppsSearchContainerLayout(Context context) {
this(context, null);
@@ -91,9 +87,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText
spanned.setSpan(new TintedDrawableSpan(getContext(), R.drawable.ic_allapps_search),
0, 1, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
setHint(spanned);
// Note: This spring does nothing.
mSpring = new SpringAnimation(new FloatValueHolder()).setSpring(new SpringForce(0));
}
@Override
@@ -145,11 +138,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText
new DefaultAppSearchAlgorithm(mApps.getApps()), this, mLauncher, this);
}
@Override
public @NonNull SpringAnimation getSpringForFling() {
return mSpring;
}
@Override
public void onAppsUpdated() {
mSearchBarController.refreshSearchResult();
@@ -206,22 +194,15 @@ public class AppsSearchContainerLayout extends ExtendedEditText
}
@Override
public void addOnScrollRangeChangeListener(final OnScrollRangeChangeListener listener) {
mLauncher.getHotseat().addOnLayoutChangeListener(new OnLayoutChangeListener() {
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) {
DeviceProfile dp = mLauncher.getDeviceProfile();
if (!dp.isVerticalBarLayout()) {
Rect insets = dp.getInsets();
int hotseatBottom = bottom - dp.hotseatBarBottomPaddingPx - insets.bottom;
MarginLayoutParams mlp = ((MarginLayoutParams) getLayoutParams());
int myBot = mlp.topMargin + (int) getTranslationY() + mlp.height;
listener.onScrollRangeChanged(hotseatBottom - myBot);
} else {
listener.onScrollRangeChanged(bottom);
}
}
});
public void setInsets(Rect insets) {
DeviceProfile dp = mLauncher.getDeviceProfile();
if (dp.isVerticalBarLayout()) {
mLauncher.getAllAppsController().setScrollRangeDelta(0);
} else {
MarginLayoutParams mlp = ((MarginLayoutParams) getLayoutParams());
int myBot = mlp.topMargin + (int) getTranslationY() + mlp.height;
mLauncher.getAllAppsController().setScrollRangeDelta(
dp.hotseatBarBottomPaddingPx + myBot);
}
}
}