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

Merge "Fix monkey bug when focus change before layout"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-07 15:02:53 +00:00
committed by Android (Google) Code Review
parent 886ae9fd26 45362a6b72
commit 0591b8ccc5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/SimpleMonthView.java
View File

@@ -517,6 +517,8 @@ class SimpleMonthView extends View {
private int findClosestRow(@Nullable Rect previouslyFocusedRect) {
if (previouslyFocusedRect == null) {
return 3;
} else if (mDayHeight == 0) {
return 0; // There hasn't been a layout, so just choose the first row
} else {
int centerY = previouslyFocusedRect.centerY();
@@ -545,6 +547,8 @@ class SimpleMonthView extends View {
private int findClosestColumn(@Nullable Rect previouslyFocusedRect) {
if (previouslyFocusedRect == null) {
return DAYS_IN_WEEK / 2;
} else if (mCellWidth == 0) {
return 0; // There hasn't been a layout, so we can just choose the first column
} else {
int centerX = previouslyFocusedRect.centerX() - mPaddingLeft;
final int columnFromLeft =