diff options
author | Mady Mellor <madym@google.com> | 2015-04-30 19:06:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 19:06:45 +0000 |
commit | 2619ef3918e15bf415fb038e942cfbd98bff4c6a (patch) | |
tree | 3ecf6cd6e37554075ae9b40249ff14882f061e22 /core/java/android/app | |
parent | 08b51bfe8532ab7eff38ad69ad46c251be5c2792 (diff) | |
parent | e82067b57595a2bce656e5ba3a9bcf19048f2f25 (diff) | |
download | frameworks_base-2619ef3918e15bf415fb038e942cfbd98bff4c6a.zip frameworks_base-2619ef3918e15bf415fb038e942cfbd98bff4c6a.tar.gz frameworks_base-2619ef3918e15bf415fb038e942cfbd98bff4c6a.tar.bz2 |
Merge "Add onStylusButtonPress listener to View" into mnc-dev
Diffstat (limited to 'core/java/android/app')
-rw-r--r-- | core/java/android/app/AssistStructure.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/app/AssistStructure.java b/core/java/android/app/AssistStructure.java index 9946d79..3abbb5b 100644 --- a/core/java/android/app/AssistStructure.java +++ b/core/java/android/app/AssistStructure.java @@ -224,6 +224,7 @@ final public class AssistStructure implements Parcelable { static final int FLAGS_CHECKED = 0x00000200; static final int FLAGS_CLICKABLE = 0x00004000; static final int FLAGS_LONG_CLICKABLE = 0x00200000; + static final int FLAGS_STYLUS_BUTTON_PRESSABLE = 0x00400000; int mFlags; @@ -401,6 +402,10 @@ final public class AssistStructure implements Parcelable { return (mFlags&ViewNode.FLAGS_LONG_CLICKABLE) != 0; } + public boolean isStylusButtonPressable() { + return (mFlags&ViewNode.FLAGS_STYLUS_BUTTON_PRESSABLE) != 0; + } + public String getClassName() { return mClassName; } @@ -513,6 +518,12 @@ final public class AssistStructure implements Parcelable { } @Override + public void setStylusButtonPressable(boolean state) { + mNode.mFlags = (mNode.mFlags&~ViewNode.FLAGS_STYLUS_BUTTON_PRESSABLE) + | (state ? ViewNode.FLAGS_STYLUS_BUTTON_PRESSABLE : 0); + } + + @Override public void setFocusable(boolean state) { mNode.mFlags = (mNode.mFlags&~ViewNode.FLAGS_FOCUSABLE) | (state ? ViewNode.FLAGS_FOCUSABLE : 0); |