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

Commit 7e06ea80 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 3245210 - Bad window style for action modes for light holo dialog theme 

Also fixed some issues with the overlay action mode window styles.

Change-Id: Ie4cf43f6ccf720ef0090ca8bd667fb6d78152f93
parent d94d6e77

core/java/android/preference/DialogPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -338,8 +338,7 @@ public abstract class DialogPreference extends Preference implements 
            return null;

        }

        

        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(

                Context.LAYOUT_INFLATER_SERVICE);

        LayoutInflater inflater = LayoutInflater.from(mBuilder.getContext());

        return inflater.inflate(mDialogLayoutResId, null);

    }

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -549,6 +549,9 @@ 
        <!-- Drawable to use for the Paste action button in Contextual Action Bar -->

        <attr name="actionModePasteDrawable" format="reference" />



        <!-- PopupWindow style to use for action modes when showing as a window overlay. -->

        <attr name="actionModePopupWindowStyle" format="reference" />

        

        <!-- =================== -->

        <!-- Preference styles   -->

        <!-- =================== -->

core/res/res/values/styles.xml

+22 −2
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ 
    <!-- A special animation value used internally for popup windows. -->

    <style name="Animation.PopupWindow" />



    <!-- Window animations used for action mode UI in overlay mode. -->

    <style name="Animation.PopupWindow.ActionMode">

        <item name="windowEnterAnimation">@anim/fade_in</item>

        <item name="windowExitAnimation">@anim/fade_out</item>

    </style>



    <!-- Status Bar Styles -->



    <style name="TextAppearance.StatusBar">
@@ -1340,7 +1346,7 @@ 
    </style>



    <style name="Widget.Holo.ButtonGroup.AlertDialog">

        <item name="android:background">@android:drawable/dialog_divider_horizontal_holo_dark</item>

        <item name="android:background">@null</item>

    </style>



    <style name="Widget.Holo.TextView" parent="Widget.TextView">
@@ -1428,6 +1434,11 @@ 
    <style name="Widget.Holo.PopupWindow" parent="Widget.PopupWindow">

    </style>



    <style name="Widget.Holo.PopupWindow.ActionMode">

        <item name="android:popupBackground">@android:color/black</item>

        <item name="android:popupAnimationStyle">@android:style/Animation.PopupWindow.ActionMode</item>

    </style>



    <style name="Widget.Holo.ProgressBar" parent="Widget.ProgressBar">

        <item name="android:indeterminateDrawable">@android:drawable/progress_medium_holo</item>

        <item name="android:animationResolution">33</item>
@@ -1659,6 +1670,10 @@ 
        <item name="android:paddingBottom">4dip</item>

    </style>



    <style name="Widget.Holo.Light.Button.Borderless">

        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>



    <style name="Widget.Holo.Light.Button.Small">

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

        <item name="android:textColor">@android:color/primary_text_holo_light</item>
@@ -1688,7 +1703,7 @@ 
    </style>



    <style name="Widget.Holo.Light.ButtonGroup.AlertDialog">

        <item name="android:background">@android:drawable/dialog_divider_horizontal_holo_light</item>

        <item name="android:background">@null</item>

    </style>



    <style name="Widget.Holo.Light.TextView" parent="Widget.TextView">
@@ -1760,6 +1775,11 @@ 
    <style name="Widget.Holo.Light.PopupWindow" parent="Widget.PopupWindow">

    </style>



    <style name="Widget.Holo.Light.PopupWindow.ActionMode">

        <item name="android:popupBackground">@android:color/white</item>

        <item name="android:popupAnimationStyle">@android:style/Animation.PopupWindow.ActionMode</item>

    </style>



    <style name="Widget.Holo.Light.ProgressBar" parent="Widget.Holo.ProgressBar">

    </style>

core/res/res/values/themes.xml

+7 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ 
        <item name="actionModeCloseButtonStyle">@style/Widget.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.ActionBar</item>

        <item name="actionBarSize">56dip</item>

        <item name="actionModePopupWindowStyle">?android:attr/popupWindowStyle</item>



        <item name="dividerVertical">@drawable/divider_vertical_dark</item>

        <item name="dividerHorizontal">@drawable/divider_vertical_dark</item>
@@ -899,6 +900,7 @@ 
        <item name="actionModeCloseButtonStyle">@style/Widget.Holo.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.Holo.ActionBar</item>

        <item name="actionBarSize">56dip</item>

        <item name="actionModePopupWindowStyle">@android:style/Widget.Holo.PopupWindow.ActionMode</item>



        <item name="dividerVertical">?android:attr/listDivider</item>

        <item name="dividerHorizontal">?android:attr/listDivider</item>
@@ -988,6 +990,7 @@ 


        <item name="groupButtonBackground">@android:drawable/group_button_background_holo_light</item>

        <item name="selectableItemBackground">@android:drawable/item_background_holo_light</item>

        <item name="borderlessButtonStyle">@android:style/Widget.Holo.Light.Button.Borderless</item>

        <item name="homeAsUpIndicator">@android:drawable/ic_ab_back_holo_light</item>



        <!-- List attributes -->
@@ -1145,6 +1148,7 @@ 
        <item name="actionModeCloseButtonStyle">@style/Widget.Holo.Light.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.Holo.Light.ActionBar</item>

        <item name="actionBarSize">56dip</item>

        <item name="actionModePopupWindowStyle">@android:style/Widget.Holo.Light.PopupWindow.ActionMode</item>



        <item name="dividerVertical">?android:attr/listDivider</item>

        <item name="dividerHorizontal">?android:attr/listDivider</item>
@@ -1212,6 +1216,7 @@ 


        <item name="android:colorBackgroundCacheHint">@null</item>



        <item name="android:buttonGroupStyle">@android:style/Widget.Holo.ButtonGroup.AlertDialog</item>

        <item name="android:groupButtonBackground">?android:attr/selectableItemBackground</item>

        

        <item name="textAppearance">@android:style/TextAppearance.Holo</item>
@@ -1278,9 +1283,11 @@ 
        <item name="android:windowAnimationStyle">@android:style/Animation.Holo.Dialog</item>

        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowActionModeOverlay">true</item>



        <item name="android:colorBackgroundCacheHint">@null</item>



        <item name="android:buttonGroupStyle">@android:style/Widget.Holo.Light.ButtonGroup.AlertDialog</item>

        <item name="android:groupButtonBackground">?android:attr/selectableItemBackground</item>



        <item name="textAppearance">@android:style/TextAppearance.Holo.Light</item>

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+2 −1
Original line number Diff line number Diff line
@@ -1881,7 +1881,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
                if (mActionModeView == null) {

                    if (hasFeature(FEATURE_ACTION_MODE_OVERLAY)) {

                        mActionModeView = new ActionBarContextView(mContext);

                        mActionModePopup = new PopupWindow(mContext);

                        mActionModePopup = new PopupWindow(mContext, null,

                                com.android.internal.R.attr.actionModePopupWindowStyle);

                        mActionModePopup.setLayoutInScreenEnabled(true);

                        mActionModePopup.setClippingEnabled(false);

                        mActionModePopup.setContentView(mActionModeView);