diff options
| author | Adam Powell <adamp@google.com> | 2010-10-04 14:28:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 14:28:08 -0700 |
| commit | a143e83e1e179ee587540150989cdfd220923f96 (patch) | |
| tree | 6fbc0c5036845a9c06010490492a7118651e0c68 /core/res | |
| parent | e14e8e31fa56ff96659c8ad03c3387aaa96fed2b (diff) | |
| parent | 7de900f3629e53e1a05b8d5854cf0164446346ae (diff) | |
| download | frameworks_base-a143e83e1e179ee587540150989cdfd220923f96.zip frameworks_base-a143e83e1e179ee587540150989cdfd220923f96.tar.gz frameworks_base-a143e83e1e179ee587540150989cdfd220923f96.tar.bz2 | |
am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'
* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
Fix bug 3058324
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 5df95de..8e2b762 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2363,7 +2363,7 @@ </declare-styleable> <declare-styleable name="PopupWindow"> <attr name="popupBackground" format="reference|color" /> - <attr name="windowAnimationStyle" /> + <attr name="popupAnimationStyle" format="reference" /> </declare-styleable> <declare-styleable name="ViewAnimator"> <!-- Identifier for the animation to use when a view is shown. --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 8592820..35f8df5 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1256,6 +1256,7 @@ <public type="attr" name="textSelectHandleRight" id="0x010102c6" /> <public type="attr" name="textSelectHandle" id="0x010102c7" /> <public type="attr" name="textSelectHandleWindowStyle" id="0x010102c8" /> + <public type="attr" name="popupAnimationStyle" id="0x010102c9" /> <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" /> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 6e9530c..27bf8fc 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -196,6 +196,9 @@ <item name="windowExitAnimation">@anim/fade_out</item> </style> + <!-- A special animation value used internally for popup windows. --> + <style name="Animation.PopupWindow" /> + <!-- Status Bar Styles --> <style name="TextAppearance.StatusBar"> @@ -564,6 +567,7 @@ <style name="Widget.PopupWindow"> <item name="android:popupBackground">@android:drawable/editbox_dropdown_background_dark</item> + <item name="android:popupAnimationStyle">@android:style/Animation.PopupWindow</item> </style> <!-- Default style for {@link android.app.FragmentBreadCrumbs} view. --> @@ -883,7 +887,7 @@ <!-- Style for the small popup windows that contain text selection anchors. --> <style name="Widget.TextSelectHandle"> - <item name="android:windowAnimationStyle">@android:style/Animation.TextSelectHandle</item> + <item name="android:popupAnimationStyle">@android:style/Animation.TextSelectHandle</item> </style> <!-- Style for animating text selection handles. --> |