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

Commit d413eb38 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"

parents ce801c4a 8ee6d7c2

core/java/android/widget/PopupWindow.java

+16 −1
Original line number Diff line number Diff line
@@ -796,6 +796,21 @@ public class PopupWindow { 
     * @param y the popup's y location offset

     */

    public void showAtLocation(View parent, int gravity, int x, int y) {

        showAtLocation(parent.getWindowToken(), gravity, x, y);

    }



    /**

     * Display the content view in a popup window at the specified location.

     *

     * @param token Window token to use for creating the new window

     * @param gravity the gravity which controls the placement of the popup window

     * @param x the popup's x location offset

     * @param y the popup's y location offset

     *

     * @hide Internal use only. Applications should use

     *       {@link #showAtLocation(View, int, int, int)} instead.

     */

    public void showAtLocation(IBinder token, int gravity, int x, int y) {

        if (isShowing() || mContentView == null) {

            return;

        }
@@ -805,7 +820,7 @@ public class PopupWindow { 
        mIsShowing = true;

        mIsDropdown = false;



        WindowManager.LayoutParams p = createPopupLayout(parent.getWindowToken());

        WindowManager.LayoutParams p = createPopupLayout(token);

        p.windowAnimations = computeAnimationResource();

       

        preparePopup(p);

core/res/res/drawable/btn_cab_done_holo_dark.xml

+2 −3
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 
     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_window_focused="false" android:state_enabled="true"

        android:drawable="@drawable/btn_cab_done_default_holo_dark" />

<selector xmlns:android="http://schemas.android.com/apk/res/android"

          android:exitFadeDuration="@android:integer/config_mediumAnimTime">

    <item android:state_pressed="true"

        android:drawable="@drawable/btn_cab_done_pressed_holo_dark" />

    <item android:state_focused="true" android:state_enabled="true"

core/res/res/drawable/btn_cab_done_holo_light.xml

+2 −3
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 
     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_window_focused="false" android:state_enabled="true"

        android:drawable="@drawable/btn_cab_done_default_holo_light" />

<selector xmlns:android="http://schemas.android.com/apk/res/android"

          android:exitFadeDuration="@android:integer/config_mediumAnimTime">

    <item android:state_pressed="true"

        android:drawable="@drawable/btn_cab_done_pressed_holo_light" />

    <item android:state_focused="true" android:state_enabled="true"

core/res/res/drawable/item_background_holo_dark.xml

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android"

          android:exitFadeDuration="@android:integer/config_mediumAnimTime">



    <item android:state_window_focused="false" android:drawable="@color/transparent" />



    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->

    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />

    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />

core/res/res/drawable/item_background_holo_light.xml

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android"

          android:exitFadeDuration="@android:integer/config_mediumAnimTime">



    <item android:state_window_focused="false" android:drawable="@color/transparent" />



    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->

    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_light" />

    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_light" />