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

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

am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 

* commit '17ec7920bab6cbec4be42f4f0db8c8e6cc2f484e':
  Finish materializing dialogs
parents 971b0d47 ebff4063

core/java/com/android/internal/app/AlertController.java

+4 −0
Original line number Diff line number Diff line
@@ -461,6 +461,10 @@ public class AlertController { 
        final View buttonPanel = mWindow.findViewById(R.id.buttonPanel);

        if (!hasButtons) {

            buttonPanel.setVisibility(View.GONE);

            final View spacer = mWindow.findViewById(R.id.textSpacerNoButtons);

            if (spacer != null) {

                spacer.setVisibility(View.VISIBLE);

            }

            mWindow.setCloseOnTouchOutsideIfNotSet(true);

        }

core/res/res/layout/alert_dialog_material.xml

+14 −5
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false">

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">

                <TextView android:id="@+id/message"

                          style="?attr/textAppearanceMedium"

                          android:layout_width="match_parent"
@@ -68,6 +72,11 @@ 
                          android:paddingStart="@dimen/alert_dialog_padding_material"

                          android:paddingTop="@dimen/alert_dialog_padding_top_material"

                          android:paddingEnd="@dimen/alert_dialog_padding_material" />

                <Space android:id="@+id/textSpacerNoButtons"

                       android:visibility="gone"

                       android:layout_width="0dp"

                       android:layout_height="@dimen/alert_dialog_padding_top_material" />

            </LinearLayout>

        </ScrollView>

    </LinearLayout>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2062,4 +2062,5 @@ 
  <java-symbol type="array" name="config_default_vm_number" />

  <java-symbol type="integer" name="config_cdma_3waycall_flash_delay"/>

  <java-symbol type="attr" name="windowBackgroundFallback" />

  <java-symbol type="id" name="textSpacerNoButtons" />

</resources>

core/res/res/values/themes_material.xml

+6 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ please see themes_device_defaults.xml. 
        <item name="listChoiceBackgroundIndicator">?attr/selectableItemBackground</item>

        <item name="activatedBackgroundIndicator">@drawable/activated_background_material</item>



        <item name="listDividerAlertDialog">@drawable/list_divider_material</item>

        <item name="listDividerAlertDialog">@null</item>



        <item name="expandableListPreferredItemPaddingLeft">40dip</item>

        <item name="expandableListPreferredChildPaddingLeft">?attr/expandableListPreferredItemPaddingLeft</item>
@@ -481,7 +481,7 @@ please see themes_device_defaults.xml. 
        <item name="expandableListPreferredChildIndicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item>

        <item name="expandableListPreferredChildIndicatorRight">?attr/expandableListPreferredItemIndicatorRight</item>



        <item name="listDividerAlertDialog">@drawable/list_divider_material</item>

        <item name="listDividerAlertDialog">@null</item>

        <item name="findOnPageNextDrawable">@drawable/ic_find_next_material</item>

        <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_material</item>
@@ -1015,6 +1015,8 @@ please see themes_device_defaults.xml. 
        <item name="listPreferredItemPaddingStart">16dip</item>

        <item name="listPreferredItemPaddingEnd">16dip</item>



        <item name="listDivider">@null</item>



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

    </style>
@@ -1127,6 +1129,8 @@ please see themes_device_defaults.xml. 
        <item name="listPreferredItemPaddingStart">16dip</item>

        <item name="listPreferredItemPaddingEnd">16dip</item>



        <item name="listDivider">@null</item>



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

    </style>