Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use max height attr as backup for device config" into tm-dev am: 248de47fe1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18529605

Change-Id: Ie2f1b0b1c3d82ace9b4f517fb0ce0f6bea537933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-25 03:54:20 +00:00
committed by Automerger Merge Worker
parent 0dd9f89200 248de47fe1
commit b17d87fc21
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/autofill/java/com/android/server/autofill/ui/CustomScrollView.java
View File

@@ -56,39 +56,41 @@ public class CustomScrollView extends ScrollView {
private int mWidth = -1; private int mWidth = -1;
private int mHeight = -1; private int mHeight = -1;
private int mMaxPortraitBodyHeightPercent = 20; private int mMaxPortraitBodyHeightPercent;
private int mMaxLandscapeBodyHeightPercent = 20; private int mMaxLandscapeBodyHeightPercent;
private int mAttrBasedMaxHeightPercent;
public CustomScrollView(Context context) { public CustomScrollView(Context context) {
super(context); super(context);
setMaxBodyHeightPercent(); setMaxBodyHeightPercent(context);
} }
public CustomScrollView(Context context, AttributeSet attrs) { public CustomScrollView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
setMaxBodyHeightPercent(); setMaxBodyHeightPercent(context);
} }
public CustomScrollView(Context context, AttributeSet attrs, int defStyleAttr) { public CustomScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
setMaxBodyHeightPercent(); setMaxBodyHeightPercent(context);
} }
public CustomScrollView(Context context, AttributeSet attrs, int defStyleAttr, public CustomScrollView(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) { int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
setMaxBodyHeightPercent(); setMaxBodyHeightPercent(context);
} }
private void setMaxBodyHeightPercent() { private void setMaxBodyHeightPercent(Context context) {
mAttrBasedMaxHeightPercent = getAttrBasedMaxHeightPercent(context);
mMaxPortraitBodyHeightPercent = DeviceConfig.getInt( mMaxPortraitBodyHeightPercent = DeviceConfig.getInt(
DeviceConfig.NAMESPACE_AUTOFILL, DeviceConfig.NAMESPACE_AUTOFILL,
DEVICE_CONFIG_SAVE_DIALOG_PORTRAIT_BODY_HEIGHT_MAX_PERCENT, DEVICE_CONFIG_SAVE_DIALOG_PORTRAIT_BODY_HEIGHT_MAX_PERCENT,
mMaxPortraitBodyHeightPercent); mAttrBasedMaxHeightPercent);
mMaxLandscapeBodyHeightPercent = DeviceConfig.getInt( mMaxLandscapeBodyHeightPercent = DeviceConfig.getInt(
DeviceConfig.NAMESPACE_AUTOFILL, DeviceConfig.NAMESPACE_AUTOFILL,
DEVICE_CONFIG_SAVE_DIALOG_LANDSCAPE_BODY_HEIGHT_MAX_PERCENT, DEVICE_CONFIG_SAVE_DIALOG_LANDSCAPE_BODY_HEIGHT_MAX_PERCENT,
mMaxLandscapeBodyHeightPercent); mAttrBasedMaxHeightPercent);
} }
@Override @Override
@@ -117,29 +119,27 @@ public class CustomScrollView extends ScrollView {
final int contentHeight = content.getMeasuredHeight(); final int contentHeight = content.getMeasuredHeight();
int displayHeight = point.y; int displayHeight = point.y;
int configBasedMaxHeight = (getResources().getConfiguration().orientation int maxHeight = (getResources().getConfiguration().orientation
== Configuration.ORIENTATION_LANDSCAPE) == Configuration.ORIENTATION_LANDSCAPE)
? (int) (mMaxLandscapeBodyHeightPercent * displayHeight / 100) ? (int) (mMaxLandscapeBodyHeightPercent * displayHeight / 100)
: (int) (mMaxPortraitBodyHeightPercent * displayHeight / 100); : (int) (mMaxPortraitBodyHeightPercent * displayHeight / 100);
mHeight = configBasedMaxHeight > 0 mHeight = Math.min(contentHeight, maxHeight);
? Math.min(contentHeight, configBasedMaxHeight)
: Math.min(contentHeight, getAttrBasedMaxHeight(context, displayHeight));
if (sDebug) { if (sDebug) {
Slog.d(TAG, "calculateDimensions():" Slog.d(TAG, "calculateDimensions():"
+ " mMaxPortraitBodyHeightPercent=" + mMaxPortraitBodyHeightPercent + " mMaxPortraitBodyHeightPercent=" + mMaxPortraitBodyHeightPercent
+ ", mMaxLandscapeBodyHeightPercent=" + mMaxLandscapeBodyHeightPercent + ", mMaxLandscapeBodyHeightPercent=" + mMaxLandscapeBodyHeightPercent
+ ", configBasedMaxHeight=" + configBasedMaxHeight + ", mAttrBasedMaxHeightPercent=" + mAttrBasedMaxHeightPercent
+ ", attrBasedMaxHeight=" + getAttrBasedMaxHeight(context, displayHeight) + ", maxHeight=" + maxHeight
+ ", contentHeight=" + contentHeight + ", contentHeight=" + contentHeight
+ ", w=" + mWidth + ", h=" + mHeight); + ", w=" + mWidth + ", h=" + mHeight);
} }
} }
private int getAttrBasedMaxHeight(Context context, int displayHeight) { private int getAttrBasedMaxHeightPercent(Context context) {
final TypedValue maxHeightAttrTypedValue = new TypedValue(); final TypedValue maxHeightAttrTypedValue = new TypedValue();
context.getTheme().resolveAttribute(R.attr.autofillSaveCustomSubtitleMaxHeight, context.getTheme().resolveAttribute(R.attr.autofillSaveCustomSubtitleMaxHeight,
maxHeightAttrTypedValue, true); maxHeightAttrTypedValue, true);
return (int) maxHeightAttrTypedValue.getFraction(displayHeight, displayHeight); return (int) maxHeightAttrTypedValue.getFraction(100, 100);
} }
} }