Merge cherrypicks of ['googleplex-android-review.googlesource.com/24022302',... (2ae06da5) · Commits · e / os / android_frameworks_base

core/java/android/widget/ScrollView.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1550,6 +1550,7 @@ public class ScrollView extends FrameLayout {
		float deltaDistance = -unconsumed * FLING_DESTRETCH_FACTOR / size;
		int consumed = Math.round(-size / FLING_DESTRETCH_FACTOR
		* mEdgeGlowTop.onPullDistance(deltaDistance, 0.5f));
		mEdgeGlowTop.onRelease();
		if (consumed != unconsumed) {
		mEdgeGlowTop.finish();
		}
		@@ -1560,6 +1561,7 @@ public class ScrollView extends FrameLayout {
		float deltaDistance = unconsumed * FLING_DESTRETCH_FACTOR / size;
		int consumed = Math.round(size / FLING_DESTRETCH_FACTOR
		* mEdgeGlowBottom.onPullDistance(deltaDistance, 0.5f));
		mEdgeGlowBottom.onRelease();
		if (consumed != unconsumed) {
		mEdgeGlowBottom.finish();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:shape="rectangle">
		<solid android:color="?androidprv:attr/colorSurface"/>
		<solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
		<size
		android:width="@dimen/keyguard_affordance_fixed_width"
		android:height="@dimen/keyguard_affordance_fixed_height"/>

+4 −4

Original line number	Diff line number	Diff line
		@@ -377,9 +377,9 @@ object KeyguardBottomAreaViewBinder {
		Utils.getColorAttrDefaultColor(
		view.context,
		if (viewModel.isActivated) {
		com.android.internal.R.attr.textColorPrimaryInverse
		com.android.internal.R.attr.materialColorOnPrimaryFixed
		} else {
		com.android.internal.R.attr.textColorPrimary
		com.android.internal.R.attr.materialColorOnSurface
		},
		)
		)
		@@ -389,9 +389,9 @@ object KeyguardBottomAreaViewBinder {
		Utils.getColorAttr(
		view.context,
		if (viewModel.isActivated) {
		com.android.internal.R.attr.colorAccentPrimary
		com.android.internal.R.attr.materialColorPrimaryFixed
		} else {
		com.android.internal.R.attr.colorSurface
		com.android.internal.R.attr.materialColorSurfaceContainerHigh
		}
		)
		} else {