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

Merge \\\"Correctly finish activity in non-focused stack\\\" into nyc-mr1-dev am: d3786148f3 am: 4cad633101

Browse Source 
am: 498ad9a370

Change-Id: I4f081328330d121fa70a0e202d1f163dda157ebf
This commit is contained in:
Andrii Kulian
2016-07-29 00:37:04 +00:00
committed by android-build-merger
parent b05a6235f8 498ad9a370
commit 6bb7cacc3b
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/view/View.java
View File

@@ -14782,26 +14782,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
private void getRoundVerticalScrollBarBounds(Rect bounds) {
final int inside = (mViewFlags & SCROLLBARS_OUTSIDE_MASK) == 0 ? ~0 : 0;
int verticalScrollbarPosition = mVerticalScrollbarPosition;
if (verticalScrollbarPosition == SCROLLBAR_POSITION_DEFAULT) {
verticalScrollbarPosition = isLayoutRtl() ?
SCROLLBAR_POSITION_LEFT : SCROLLBAR_POSITION_RIGHT;
}
final int width = mRight - mLeft;
final int height = mBottom - mTop;
switch (verticalScrollbarPosition) {
default:
case SCROLLBAR_POSITION_RIGHT:
bounds.left = mScrollX - (mUserPaddingRight & inside);
break;
case SCROLLBAR_POSITION_LEFT:
bounds.left = mScrollX + (mUserPaddingLeft & inside);
break;
}
bounds.top = mScrollY + (mPaddingTop & inside);
// Do not take padding into account as we always want the scrollbars
// to hug the screen for round wearable devices.
bounds.left = mScrollX;
bounds.top = mScrollY;
bounds.right = bounds.left + width;
bounds.bottom = mScrollY + height - (mUserPaddingBottom & inside);
bounds.bottom = mScrollY + height;
}
private void getStraightVerticalScrollBarBounds(Rect bounds) {