diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-03-15 21:51:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-15 21:51:29 +0000 |
| commit | 47d07fde90fa4e9c5eb68f91e858b0a8c208e247 (patch) | |
| tree | 32e565745799979af09e92b0fd7f0b0de275038a /core/java/android/view/View.java | |
| parent | f5e187522b297700437abf9cfb94dca8290bfb83 (diff) | |
| parent | 20a1cf345f5f7952677d5f9cd97efe1a9a197930 (diff) | |
| download | frameworks_base-47d07fde90fa4e9c5eb68f91e858b0a8c208e247.zip frameworks_base-47d07fde90fa4e9c5eb68f91e858b0a8c208e247.tar.gz frameworks_base-47d07fde90fa4e9c5eb68f91e858b0a8c208e247.tar.bz2 | |
am 20a1cf34: am 93b04b91: Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev
* commit '20a1cf345f5f7952677d5f9cd97efe1a9a197930':
Avoid warnings about synthesized IDs.
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 0a2db91..865c345 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5038,7 +5038,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } if ((mAttachInfo.mAccessibilityFetchFlags - & AccessibilityNodeInfo.FLAG_REPORT_VIEW_IDS) != 0) { + & AccessibilityNodeInfo.FLAG_REPORT_VIEW_IDS) != 0 + && Resources.resourceHasPackage(mID)) { try { String viewId = getResources().getResourceName(mID); info.setViewIdResourceName(viewId); @@ -11552,7 +11553,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, final int scrollY = mScrollY; final int inside = (viewFlags & SCROLLBARS_OUTSIDE_MASK) == 0 ? ~0 : 0; - int left, top, right, bottom; + int left; + int top; + int right; + int bottom; if (drawHorizontalScrollBar) { int size = scrollBar.getSize(false); |