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

Commit 40eec4c0 authored by Adam Powell's avatar Adam Powell
Browse files

Fix the size of DialogWhenLarge windows 

Change-Id: I8c9588e958d8fb9c45b1cdb235cced48ba508dd3
parent 30167542

core/res/res/values-large/themes.xml

+4 −4
Original line number Diff line number Diff line
@@ -33,17 +33,17 @@ please see themes_device_defaults.xml. 
 -->

<resources>

    <style name="Theme.Holo.DialogWhenLarge"

            parent="@android:style/Theme.Holo.Dialog.MinWidth">

            parent="@android:style/Theme.Holo.Dialog.FixedSize">

        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>

    <style name="Theme.Holo.DialogWhenLarge.NoActionBar"

            parent="@android:style/Theme.Holo.Dialog.NoActionBar.MinWidth">

            parent="@android:style/Theme.Holo.Dialog.NoActionBar.FixedSize">

        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>

    <style name="Theme.Holo.Light.DialogWhenLarge"

            parent="@android:style/Theme.Holo.Light.Dialog.MinWidth">

            parent="@android:style/Theme.Holo.Light.Dialog.FixedSize">

    </style>

    <style name="Theme.Holo.Light.DialogWhenLarge.NoActionBar"

            parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar.MinWidth">

            parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar.FixedSize">

    </style>

</resources>

core/res/res/values-large/themes_device_defaults.xml

+4 −4
Original line number Diff line number Diff line
@@ -32,17 +32,17 @@ easier. 
 -->

<resources>

    <style name="Theme.DeviceDefault.DialogWhenLarge"

            parent="@android:style/Theme.DeviceDefault.Dialog.MinWidth">

            parent="@android:style/Theme.DeviceDefault.Dialog.FixedSize">

        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>

    <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar"

            parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar.MinWidth">

            parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar.FixedSize">

        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>

    <style name="Theme.DeviceDefault.Light.DialogWhenLarge"

            parent="@android:style/Theme.DeviceDefault.Light.Dialog.MinWidth">

            parent="@android:style/Theme.DeviceDefault.Light.Dialog.FixedSize">

    </style>

    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"

            parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth">

            parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize">

    </style>

</resources>

core/res/res/values-sw600dp/dimens.xml

+14 −0
Original line number Diff line number Diff line
@@ -68,5 +68,19 @@ 


    <!-- Minimum width for an action button in the menu area of an action bar -->

    <dimen name="action_button_min_width">64dip</dimen>



    <!-- The platform's desired fixed width for a dialog along the major axis

         (the screen is in landscape). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_width_major">50%</item>

    <!-- The platform's desired fixed width for a dialog along the minor axis

         (the screen is in portrait). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_width_minor">70%</item>

    <!-- The platform's desired fixed height for a dialog along the major axis

         (the screen is in portrait). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_height_major">60%</item>

    <!-- The platform's desired fixed height for a dialog along the minor axis

         (the screen is in landscape). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_height_minor">90%</item>



</resources>

core/res/res/values/attrs.xml

+18 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,24 @@ 
             an absolute dimension or a fraction of the screen size in that

             dimension. -->

        <attr name="windowMinWidthMinor" format="dimension|fraction" />



        <!-- A fixed width for the window along the major axis of the screen,

             that is, when in landscape. Can be either an absolute dimension

             or a fraction of the screen size in that dimension. -->

        <attr name="windowFixedWidthMajor" format="dimension|fraction" />

        <!-- A fixed height for the window along the minor axis of the screen,

             that is, when in landscape. Can be either an absolute dimension

             or a fraction of the screen size in that dimension. -->

        <attr name="windowFixedHeightMinor" format="dimension|fraction" />



        <!-- A fixed width for the window along the minor axis of the screen,

             that is, when in portrait. Can be either an absolute dimension

             or a fraction of the screen size in that dimension. -->

        <attr name="windowFixedWidthMinor" format="dimension|fraction" />

        <!-- A fixed height for the window along the major axis of the screen,

             that is, when in portrait. Can be either an absolute dimension

             or a fraction of the screen size in that dimension. -->

        <attr name="windowFixedHeightMajor" format="dimension|fraction" />

    </declare-styleable>



    <!-- The set of attributes that describe a AlertDialog's theme. -->

core/res/res/values/dimens.xml

+14 −0
Original line number Diff line number Diff line
@@ -108,6 +108,20 @@ 
         is along the major axis (that is the screen is landscape).  This may

         be either a fraction or a dimension. -->

    <item type="dimen" name="dialog_min_width_major">65%</item>



    <!-- The platform's desired fixed width for a dialog along the major axis

         (the screen is in landscape). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_width_major">320dp</item>

    <!-- The platform's desired fixed width for a dialog along the minor axis

         (the screen is in portrait). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_width_minor">320dp</item>

    <!-- The platform's desired fixed height for a dialog along the major axis

         (the screen is in portrait). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_height_major">80%</item>

    <!-- The platform's desired fixed height for a dialog along the minor axis

         (the screen is in landscape). This may be either a fraction or a dimension.-->

    <item type="dimen" name="dialog_fixed_height_minor">100%</item>



    <!-- Preference activity, vertical padding for the header list -->

    <dimen name="preference_screen_header_vertical_padding">0dp</dimen>