summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-03-26 00:28:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-26 00:28:27 +0000
commit8a2b46d535e28c102b972407faa866cd15246445 (patch)
treedabb20e05b762579517ec29ec8f6a8b4b381fcc7 /core/java/android/view
parentda5c13eb8ae00c853b269996c168ccb7191c4673 (diff)
parentcbcc9695f0a701d620f48de75eaee05c4fef6f22 (diff)
downloadframeworks_base-8a2b46d535e28c102b972407faa866cd15246445.zip
frameworks_base-8a2b46d535e28c102b972407faa866cd15246445.tar.gz
frameworks_base-8a2b46d535e28c102b972407faa866cd15246445.tar.bz2
Merge "Wrong constant used for undefined accessibility window id."
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/View.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5e512b6..6ee99ec 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5726,7 +5726,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @hide
*/
public int getAccessibilityWindowId() {
- return mAttachInfo != null ? mAttachInfo.mAccessibilityWindowId : NO_ID;
+ return mAttachInfo != null ? mAttachInfo.mAccessibilityWindowId
+ : AccessibilityNodeInfo.UNDEFINED_ITEM_ID;
}
/**
@@ -19725,7 +19726,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* The id of the window for accessibility purposes.
*/
- int mAccessibilityWindowId = View.NO_ID;
+ int mAccessibilityWindowId = AccessibilityNodeInfo.UNDEFINED_ITEM_ID;
/**
* Flags related to accessibility processing.