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

Commit 25a9ed53 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "No frame and margins for dialog style preference screens."

parents b057c3db 1d0f0d2c

core/res/res/layout-xlarge/preference_list_content_single.xml

+2 −6
Original line number Diff line number Diff line
@@ -30,18 +30,14 @@ 


        <LinearLayout

            android:id="@+id/headers"

            style="?attr/preferencePanelStyle"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginRight="@dimen/preference_screen_side_margin"

            android:layout_marginLeft="@dimen/preference_screen_side_margin"

            android:layout_marginTop="48dp"

            android:layout_marginBottom="48dp"

            android:paddingLeft="32dip"

            android:paddingRight="32dip"

            android:paddingTop="32dip"

            android:paddingBottom="32dip"

            android:background="?attr/preferencePanelBackground">

            android:paddingBottom="32dip" >



            <ListView android:id="@android:id/list"

                android:layout_width="match_parent"

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

+2 −0
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ 
<resources>

    <style name="Theme.Holo.DialogWhenLarge"

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

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

    </style>

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

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

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

    </style>

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

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

core/res/res/values-xlarge/styles.xml

+8 −0
Original line number Diff line number Diff line
@@ -34,5 +34,13 @@ 
    <style name="TextAppearance.StatusBar.EventContent.Title">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="PreferencePanel">

        <item name="android:layout_marginLeft">@dimen/preference_screen_side_margin</item>

        <item name="android:layout_marginRight">@dimen/preference_screen_side_margin</item>

        <item name="android:layout_marginTop">48dip</item>

        <item name="android:layout_marginBottom">48dip</item>

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

    </style>

</resources>

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -606,6 +606,8 @@ 
        <attr name="preferenceLayoutChild" format="reference" />

        <!-- Preference panel background -->

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

        <!-- Preference panel style -->

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



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

        <!-- Text selection handle styles -->

core/res/res/values/styles.xml

+14 −0
Original line number Diff line number Diff line
@@ -915,6 +915,20 @@ 
        <item name="android:widgetLayout">@android:layout/preference_dialog</item>

    </style>



    <!-- No margins or background by default. Could be different for x-large screens -->

    <style name="PreferencePanel">

    </style>



    <!-- The attributes are overridden here because the x-large or large resources may have

         changed the margins and background in the parent PreferencePanel style. -->

    <style name="PreferencePanel.Dialog">

        <item name="android:layout_marginLeft">0dip</item>

        <item name="android:layout_marginRight">0dip</item>

        <item name="android:layout_marginTop">0dip</item>

        <item name="android:layout_marginBottom">0dip</item>

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

    </style>



    <!-- Other Misc Styles -->

    <eat-comment />