From 493611f541748cbe97ffa837ed93495b399d96a5 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Tue, 15 Mar 2016 16:29:17 -0700
Subject: [PATCH] Polished Scoped Directory Access UI.

- Set proper style on custom alert dialog view.
- Fixed padding.
- Removed redundant style.
- Fixed checkbox color.

BUG: 26750152

Change-Id: Ibf3984e1b0a092affc58f1377b89b6ab7ea2a3aa
---
 .../res/layout/dialog_open_scoped_directory.xml          | 9 ++++-----
 packages/DocumentsUI/res/values/styles.xml               | 4 ----
 .../documentsui/OpenExternalDirectoryActivity.java       | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml b/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml
index d4a450bf2f345..bfb027149333e 100644
--- a/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml
+++ b/packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml
@@ -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
diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml
index 21bdfd9ec53ca..a548d89838f1a 100644
--- a/packages/DocumentsUI/res/values/styles.xml
+++ b/packages/DocumentsUI/res/values/styles.xml
@@ -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>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
index f30ab238f5529..2b6f3968e203a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
@@ -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)