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

Commit 8a2d1d9c authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Polished Scoped Directory Access UI." into nyc-dev

parents 49b9a1b4 493611f5

packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml

+4 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:theme="@style/Theme.AppCompat.Light.Dialog.Alert"

    android:orientation="vertical"

    android:paddingEnd="24dp"

    android:paddingStart="24dp" >
@@ -28,18 +29,16 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingEnd="24dp"

        android:paddingStart="24dp"

        android:paddingTop="24dp"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"

        android:textColor="@*android:color/primary_text_default_material_light" >

        android:paddingStart="32dp"

        android:paddingTop="24dp">

    </TextView>



    <CheckBox

        android:id="@+id/do_not_ask_checkbox"

        style="?android:attr/textAppearanceSmall"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dip"

        android:text="@string/never_ask_again"

        android:textColor="?android:attr/textColorSecondary"

        android:visibility="gone" />

</LinearLayout>
 
 No newline at end of file

packages/DocumentsUI/res/values/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -46,8 +46,4 @@ 
        <item name="android:maxHeight">3dp</item>    

    </style>



    <!--  TODO: use the proper dialog and/or inline if not overriding -->

    <style name="AlertDialogTheme" parent="@style/Theme.AppCompat.Light.Dialog.Alert">

    </style>



</resources>

packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ public class OpenExternalDirectoryActivity extends Activity { 
            final View view = View.inflate(mActivity, R.layout.dialog_open_scoped_directory, null);

            final TextView messageField = (TextView) view.findViewById(R.id.message);

            messageField.setText(message);

            mDialog = new AlertDialog.Builder(mActivity, R.style.AlertDialogTheme)

            mDialog = new AlertDialog.Builder(mActivity, R.style.Theme_AppCompat_Light_Dialog_Alert)

                    .setView(view)

                    .setPositiveButton(R.string.allow, listener)

                    .setNegativeButton(R.string.deny, listener)