diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-08 11:55:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 11:55:24 -0700 |
| commit | a05088c18d22f822e78e7b91d60f518dc3dc06fc (patch) | |
| tree | 2aedf7f9109bf4d1f7bc014476e0823182686be4 /core/res | |
| parent | 6ffee9bbba53700d33456261b986ac8a3f333b9e (diff) | |
| parent | 85a3176704b5bfbeece9bd928369fbb76eec7dc6 (diff) | |
| download | frameworks_base-a05088c18d22f822e78e7b91d60f518dc3dc06fc.zip frameworks_base-a05088c18d22f822e78e7b91d60f518dc3dc06fc.tar.gz frameworks_base-a05088c18d22f822e78e7b91d60f518dc3dc06fc.tar.bz2 | |
am 85a31767: Add support for secure views.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp
* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
Add support for secure views.
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 1130b69..13c3e7e 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1274,6 +1274,12 @@ be saved. --> <attr name="saveEnabled" 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. + Refer to the {@link android.view.View} security documentation for more details. --> + <attr name="filterTouchesWhenObscured" format="boolean" /> + <!-- Defines the quality of translucent drawing caches. This property is used only when the drawing cache is enabled and translucent. The default value is auto. --> <attr name="drawingCacheQuality"> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 86e79c8..28a7cca 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1254,6 +1254,7 @@ <public type="attr" name="overscrollMode" id="0x010102c1" /> <public type="attr" name="overscrollHeader" id="0x010102c2" /> <public type="attr" name="overscrollFooter" id="0x010102c3" /> + <public type="attr" name="filterTouchesWhenObscured" id="0x010102c4" /> <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" /> |