diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-08 13:02:55 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-09-08 13:02:55 -0700 |
| commit | b380c4d7edc158788a85c906900232675c0164ac (patch) | |
| tree | 579f4e6e8cd611c0f95302e0e53b6739b2e4d84e /core/res | |
| parent | 35dc79da11639117aab34d3278a7ae90984c0f87 (diff) | |
| parent | a05088c18d22f822e78e7b91d60f518dc3dc06fc (diff) | |
| download | frameworks_base-b380c4d7edc158788a85c906900232675c0164ac.zip frameworks_base-b380c4d7edc158788a85c906900232675c0164ac.tar.gz frameworks_base-b380c4d7edc158788a85c906900232675c0164ac.tar.bz2 | |
resolved conflicts for merge of a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 7b8d427..b476b44 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1345,6 +1345,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 8594027..7bb56bd 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1251,6 +1251,8 @@ <public type="attr" name="logo" id="0x010102be" /> <public type="attr" name="xlargeScreens" id="0x010102bf" /> <public type="attr" name="immersive" id="0x010102c0" /> + <public type="attr" name="filterTouchesWhenObscured" id="0x010102c4" /> + <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" /> <public-padding type="id" name="kraken_resource_pad" end="0x01020040" /> |