Merge "Fix UDFPS alignment for shared code across new / legacy prompt." into udc-dev am: 53d81289ca am: 3d2e5c24d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23505328 Change-Id: I681cd6347d8c20b2376b51361ed2b2c05dc68809 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -638,12 +638,12 @@ public class AuthContainerView extends LinearLayout
|
|||||||
|
|
||||||
case Surface.ROTATION_90:
|
case Surface.ROTATION_90:
|
||||||
mPanelController.setPosition(AuthPanelController.POSITION_RIGHT);
|
mPanelController.setPosition(AuthPanelController.POSITION_RIGHT);
|
||||||
setScrollViewGravity(Gravity.BOTTOM | Gravity.RIGHT);
|
setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Surface.ROTATION_270:
|
case Surface.ROTATION_270:
|
||||||
mPanelController.setPosition(AuthPanelController.POSITION_LEFT);
|
mPanelController.setPosition(AuthPanelController.POSITION_LEFT);
|
||||||
setScrollViewGravity(Gravity.BOTTOM | Gravity.LEFT);
|
setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Surface.ROTATION_180:
|
case Surface.ROTATION_180:
|
||||||
|
|||||||
@@ -114,7 +114,13 @@ public class AuthPanelController extends ViewOutlineProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private int getTopBound(@Position int position) {
|
private int getTopBound(@Position int position) {
|
||||||
return Math.max(mContainerHeight - mContentHeight - mMargin, mMargin);
|
switch (position) {
|
||||||
|
case POSITION_LEFT:
|
||||||
|
case POSITION_RIGHT:
|
||||||
|
return Math.max((mContainerHeight - mContentHeight) / 2, mMargin);
|
||||||
|
default:
|
||||||
|
return Math.max(mContainerHeight - mContentHeight - mMargin, mMargin);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setContainerDimensions(int containerWidth, int containerHeight) {
|
public void setContainerDimensions(int containerWidth, int containerHeight) {
|
||||||
|
|||||||
Reference in New Issue
Block a user