Merge "Load Downloads view in full screen." (43cc95bf) · Commits · e / os / android_packages_apps_DocumentsUI

res/values/styles.xml

+18 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,24 @@
		<item name="android:windowSoftInputMode">stateUnspecified\|adjustUnspecified</item>
		</style>

		<style name="DocumentsNonDialogTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar">
		<item name="android:actionBarWidgetTheme">@null</item>
		<item name="android:actionBarTheme">@*android:style/ThemeOverlay.Material.Dark.ActionBar</item>
		<item name="android:actionBarPopupTheme">@*android:style/ThemeOverlay.Material.Light</item>

		<item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>
		<item name="android:colorPrimary">@*android:color/material_blue_grey_800</item>
		<item name="android:colorAccent">@*android:color/material_deep_teal_500</item>

		<item name="android:listDivider">@*android:drawable/list_divider_material</item>

		<item name="android:windowActionBar">false</item>
		<item name="android:windowActionModeOverlay">true</item>
		<item name="android:windowNoTitle">true</item>

		<item name="android:windowSoftInputMode">stateUnspecified\|adjustUnspecified</item>
		</style>

		<style name="StandaloneTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar">
		<item name="android:actionBarWidgetTheme">@null</item>

src/com/android/documentsui/DocumentsActivity.java

+22 −15

Original line number	Diff line number	Diff line
		@@ -102,14 +102,23 @@ public class DocumentsActivity extends BaseActivity {

		@Override
		public void onCreate(Bundle icicle) {
		mState = (icicle != null)
		? icicle.<State>getParcelable(EXTRA_STATE)
		: buildDefaultState();

		final Resources res = getResources();
		mShowAsDialog = res.getBoolean(R.bool.show_as_dialog) && mState.action != ACTION_MANAGE &&
		mState.action != ACTION_BROWSE;
		if (!mShowAsDialog) {
		setTheme(R.style.DocumentsNonDialogTheme);
		}

		super.onCreate(icicle);

		setResult(Activity.RESULT_CANCELED);
		setContentView(R.layout.activity);

		final Context context = this;
		final Resources res = getResources();
		mShowAsDialog = res.getBoolean(R.bool.show_as_dialog);

		if (mShowAsDialog) {
		// Strongly define our horizontal dimension; we leave vertical as
		@@ -126,6 +135,7 @@ public class DocumentsActivity extends BaseActivity {
		// Non-dialog means we have a drawer
		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);

		if (mDrawerLayout != null) {
		mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
		R.drawable.ic_hamburger, R.string.drawer_open, R.string.drawer_close);

		@@ -133,13 +143,10 @@ public class DocumentsActivity extends BaseActivity {

		mRootsDrawer = findViewById(R.id.drawer_roots);
		}
		}

		mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory);

		mState = (icicle != null)
		? icicle.<State>getParcelable(EXTRA_STATE)
		: buildDefaultState();

		mToolbar = (Toolbar) findViewById(R.id.toolbar);
		mToolbar.setTitleTextAppearance(context,
		android.R.style.TextAppearance_DeviceDefault_Widget_ActionBar_Title);
		@@ -159,7 +166,7 @@ public class DocumentsActivity extends BaseActivity {

		// Hide roots when we're managing a specific root
		if (mState.action == ACTION_MANAGE \|\| mState.action == ACTION_BROWSE) {
		if (mShowAsDialog) {
		if (mShowAsDialog \|\| mDrawerLayout == null) {
		findViewById(R.id.container_roots).setVisibility(View.GONE);
		} else {
		mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
		@@ -370,7 +377,7 @@ public class DocumentsActivity extends BaseActivity {
		}

		public void setRootsDrawerOpen(boolean open) {
		if (!mShowAsDialog) {
		if (!mShowAsDialog && mDrawerLayout != null) {
		if (open) {
		mDrawerLayout.openDrawer(mRootsDrawer);
		} else {
		@@ -380,7 +387,7 @@ public class DocumentsActivity extends BaseActivity {
		}

		private boolean isRootsDrawerOpen() {
		if (mShowAsDialog) {
		if (mShowAsDialog \|\| mDrawerLayout == null) {
		return false;
		} else {
		return mDrawerLayout.isDrawerOpen(mRootsDrawer);
		@@ -405,8 +412,8 @@ public class DocumentsActivity extends BaseActivity {
		}
		}

		if (!mShowAsDialog && mDrawerLayout.getDrawerLockMode(mRootsDrawer) ==
		DrawerLayout.LOCK_MODE_UNLOCKED) {
		if (!mShowAsDialog && mDrawerLayout != null &&
		mDrawerLayout.getDrawerLockMode(mRootsDrawer) == DrawerLayout.LOCK_MODE_UNLOCKED) {
		mToolbar.setNavigationIcon(R.drawable.ic_hamburger);
		mToolbar.setNavigationContentDescription(R.string.drawer_open);
		mToolbar.setNavigationOnClickListener(new View.OnClickListener() {