summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI/src
diff options
context:
space:
mode:
authorDaichi Hirono <hirono@google.com>2015-04-16 20:17:35 +0900
committerDaichi Hirono <hirono@google.com>2015-04-23 15:02:15 +0900
commit517577ea96d8749cc7052aff596c0480cb25dce0 (patch)
treed921b56c33e7bcedf218966cc3aea88c25e0c841 /packages/DocumentsUI/src
parentc1d5487307aa5367bb321cafd9ac336beec39a7e (diff)
downloadframeworks_base-517577ea96d8749cc7052aff596c0480cb25dce0.zip
frameworks_base-517577ea96d8749cc7052aff596c0480cb25dce0.tar.gz
frameworks_base-517577ea96d8749cc7052aff596c0480cb25dce0.tar.bz2
DocumentsUI: Stop to override fixed size of dialog in CreateDirectoryDialog.
Previously CreateDirectoryDialog overrides fixed size defined in the application theme. As a result, the dialog is shown as vertically long. The CL specifies explicitly specifies the default theme for dialog when creating the dialog to stop override the application theme. BUG=20239384 Change-Id: I7227bd91705c32f5196b666bbe94ff32b5cb4af8
Diffstat (limited to 'packages/DocumentsUI/src')
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java6
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java9
2 files changed, 5 insertions, 10 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
index 1a17ee0..1f7b41e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
@@ -56,7 +56,11 @@ public class CreateDirectoryFragment extends DialogFragment {
final Context context = getActivity();
final ContentResolver resolver = context.getContentResolver();
- final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ // We need to specify android.R.style.Theme_DeviceDefault_Dialog explicitly,
+ // because the application theme 'DialogWhenReallyLarge' has
+ // fixed window size properties for large screen devices.
+ final AlertDialog.Builder builder = new AlertDialog.Builder(
+ context, AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
final View view = dialogInflater.inflate(R.layout.dialog_create_dir, null, false);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java b/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
index aad42ed..1d021cb 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
@@ -80,15 +80,6 @@ public class StandaloneActivity extends BaseActivity {
final Context context = this;
- // Strongly define our horizontal dimension; we leave vertical as
- final WindowManager.LayoutParams a = getWindow().getAttributes();
-
- final Point size = new Point();
- getWindowManager().getDefaultDisplay().getSize(size);
- // a.width = (int) res.getFraction(R.dimen.dialog_width, size.x, size.x);
-
- getWindow().setAttributes(a);
-
mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory);
mState = (icicle != null)