wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 889094 - NPE in BrowserToolbar due to late initialization of mFocusOrder. [r=sriram,bnicholson]

Browse Source
This commit is contained in:
Michal Kajda 2013-07-10 11:12:25 -07:00
parent 9000441a55
commit 4543e6fdcf
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mobile/android/base/BrowserToolbar.java
View File

@ -232,6 +232,16 @@ public class BrowserToolbar extends GeckoRelativeLayout
mMenuIcon = (GeckoImageView) findViewById(R.id.menu_icon);
mActionItemBar = (LinearLayout) findViewById(R.id.menu_items);
mHasSoftMenuButton = !HardwareUtils.hasMenuButton();
// We use different layouts on phones and tablets, so adjust the focus
// order appropriately.
if (HardwareUtils.isTablet()) {
mFocusOrder = Arrays.asList(mTabs, mBack, mForward, this,
mSiteSecurity, mReader, mStop, mActionItemBar, mMenu);
} else {
mFocusOrder = Arrays.asList(this, mSiteSecurity, mReader, mStop,
mTabs, mMenu);
}
}
@Override
@ -419,16 +429,6 @@ public class BrowserToolbar extends GeckoRelativeLayout
}
});
}
// We use different layouts on phones and tablets, so adjust the focus
// order appropriately.
if (HardwareUtils.isTablet()) {
mFocusOrder = Arrays.asList(mTabs, mBack, mForward, this,
mSiteSecurity, mReader, mStop, mActionItemBar, mMenu);
} else {
mFocusOrder = Arrays.asList(this, mSiteSecurity, mReader, mStop,
mTabs, mMenu);
}
}
@Override
@ -893,26 +893,27 @@ public class BrowserToolbar extends GeckoRelativeLayout
continue;
}
if (prevView != null) {
if (view == mActionItemBar) {
final int childCount = mActionItemBar.getChildCount();
if (childCount > 1) {
View firstChild = mActionItemBar.getChildAt(0);
firstChild.setNextFocusLeftId(prevView.getId());
prevView.setNextFocusRightId(firstChild.getId());
if (view == mActionItemBar) {
final int childCount = mActionItemBar.getChildCount();
for (int child = 0; child < childCount; child++) {
View childView = mActionItemBar.getChildAt(child);
if (prevView != null) {
childView.setNextFocusLeftId(prevView.getId());
prevView.setNextFocusRightId(childView.getId());
}
view = mActionItemBar.getChildAt(childCount - 1);
prevView = childView;
}
view.setNextFocusLeftId(prevView.getId());
prevView.setNextFocusRightId(view.getId());
} else {
if (prevView != null) {
view.setNextFocusLeftId(prevView.getId());
prevView.setNextFocusRightId(view.getId());
}
prevView = view;
}
}
if (needsNewFocus) {
requestFocus();
}
prevView = view;
if (needsNewFocus) {
requestFocus();
}
}