diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-05-08 20:42:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 20:42:12 +0000 |
| commit | ed9af066b2407a36699fae2e475c4d1b53d2ca1d (patch) | |
| tree | 005f834b928f7a47220e1468b7aa90d6fee1bfd3 /core/res | |
| parent | 180fd27832b429aaca0a35e8b93c88195b6451be (diff) | |
| parent | 49b043f37d7231b1544cb72e1bfb616e5a00688d (diff) | |
| download | frameworks_base-ed9af066b2407a36699fae2e475c4d1b53d2ca1d.zip frameworks_base-ed9af066b2407a36699fae2e475c4d1b53d2ca1d.tar.gz frameworks_base-ed9af066b2407a36699fae2e475c4d1b53d2ca1d.tar.bz2 | |
Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index eaa6278..0b96d22 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2347,11 +2347,6 @@ be saved. --> <attr name="saveEnabled" format="boolean" /> - <!-- If true, no {@link android.view.ViewAssistStructure} data will be collected from - this view or any of its children. The default is false, allowing assist structure - to be reported by it. --> - <attr name="assistBlocked" format="boolean" /> - <!-- Specifies whether to filter touches when the view's window is obscured by another visible window. When set to true, the view will not receive touches whenever a toast, dialog or other window appears above the view's window. diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 297b302..e403a16 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2682,7 +2682,9 @@ <!-- NFC CardEmulation: dynamically load service resources --> <public type="attr" name="dynamicResources" /> - <public type="attr" name="assistBlocked" /> + <attr name="__reserved0" format="boolean" /> + <public type="attr" name="__reserved0" /> + <public type="attr" name="stylusButtonPressable" /> <public type="attr" name="supportsLaunchVoiceAssistFromKeyguard" /> <public type="attr" name="scrollIndicators" /> |