Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a143e83e authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread 

Merge commit '7de900f3'

* commit '7de900f3':
  Fix bug 3058324
parents e14e8e31 7de900f3

api/current.xml

+12 −12
Original line number Diff line number Diff line
@@ -6268,17 +6268,6 @@ 
 visibility="public"

>

</field>

<field name="kraken_resource_pad56"

 type="int"

 transient="false"

 volatile="false"

 value="16843465"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="kraken_resource_pad6"

 type="int"

 transient="false"
@@ -7687,6 +7676,17 @@ 
 visibility="public"

>

</field>

<field name="popupAnimationStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843465"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="popupBackground"

 type="int"

 transient="false"
@@ -90112,7 +90112,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.001f"

 value="0.0010f"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/widget/PopupWindow.java

+4 −1
Original line number Diff line number Diff line
@@ -178,7 +178,10 @@ public class PopupWindow { 
                attrs, com.android.internal.R.styleable.PopupWindow, defStyleAttr, defStyleRes);



        mBackground = a.getDrawable(R.styleable.PopupWindow_popupBackground);

        mAnimationStyle = a.getResourceId(R.styleable.PopupWindow_windowAnimationStyle, -1);



        final int animStyle = a.getResourceId(R.styleable.PopupWindow_popupAnimationStyle, -1);

        mAnimationStyle = animStyle == com.android.internal.R.style.Animation_PopupWindow ? -1 :

                animStyle;



        // If this is a StateListDrawable, try to find and store the drawable to be

        // used when the drop-down is placed above its anchor view, and the one to be

core/res/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -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. -->

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

core/res/res/values/styles.xml

+5 −1
Original line number Diff line number Diff line
@@ -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. -->