Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Felipe Leme
2016-03-16 16:22:16 +00:00
committed by Android (Google) Code Review
parent 49b9a1b4b9 493611f541
commit 8a2d1d9c3d
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DocumentsUI/res/layout/dialog_open_scoped_directory.xml
View File

@@ -18,6 +18,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="24dp" android:paddingEnd="24dp"
android:paddingStart="24dp" > android:paddingStart="24dp" >
@@ -28,18 +29,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingEnd="24dp" android:paddingEnd="24dp"
android:paddingStart="24dp" android:paddingStart="32dp"
android:paddingTop="24dp" android:paddingTop="24dp">
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="@*android:color/primary_text_default_material_light" >
</TextView> </TextView>
<CheckBox <CheckBox
android:id="@+id/do_not_ask_checkbox" android:id="@+id/do_not_ask_checkbox"
style="?android:attr/textAppearanceSmall"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dip" android:layout_marginTop="16dip"
android:text="@string/never_ask_again" android:text="@string/never_ask_again"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

4
packages/DocumentsUI/res/values/styles.xml
View File

@@ -46,8 +46,4 @@
<item name="android:maxHeight">3dp</item> <item name="android:maxHeight">3dp</item>
</style> </style>
<!-- TODO: use the proper dialog and/or inline if not overriding -->
<style name="AlertDialogTheme" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
</style>
</resources> </resources>

2
packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
View File

@@ -417,7 +417,7 @@ public class OpenExternalDirectoryActivity extends Activity {
final View view = View.inflate(mActivity, R.layout.dialog_open_scoped_directory, null); final View view = View.inflate(mActivity, R.layout.dialog_open_scoped_directory, null);
final TextView messageField = (TextView) view.findViewById(R.id.message); final TextView messageField = (TextView) view.findViewById(R.id.message);
messageField.setText(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) .setView(view)
.setPositiveButton(R.string.allow, listener) .setPositiveButton(R.string.allow, listener)
.setNegativeButton(R.string.deny, listener) .setNegativeButton(R.string.deny, listener)