Merge "Always show intern storage." into nyc-dev (b4672ef6) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/VolumeInfo.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -438,10 +438,6 @@ public class VolumeInfo implements Parcelable {
		final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);
		intent.addCategory(Intent.CATEGORY_DEFAULT);
		intent.setData(uri);

		// note that docsui treats this as force show advanced. So sending
		// false permits advanced to be shown based on user preferences.
		intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, isPrimary());
		intent.putExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, true);
		return intent;
		}

core/java/android/provider/DocumentsContract.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -92,9 +92,6 @@ public final class DocumentsContract {
		/** {@hide} */
		public static final String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME";

		/** {@hide} */
		public static final String EXTRA_SHOW_ADVANCED = "android.content.extra.SHOW_ADVANCED";

		/** {@hide} */
		public static final String EXTRA_SHOW_FILESIZE = "android.content.extra.SHOW_FILESIZE";

		@@ -563,15 +560,6 @@ public final class DocumentsContract {
		*/
		public static final int FLAG_EMPTY = 1 << 16;

		/**
		* Flag indicating that this root should only be visible to advanced
		* users.
		*
		* @see #COLUMN_FLAGS
		* @hide
		*/
		public static final int FLAG_ADVANCED = 1 << 17;

		/**
		* Flag indicating that this root has settings.
		*
		@@ -579,7 +567,7 @@ public final class DocumentsContract {
		* @see DocumentsContract#ACTION_DOCUMENT_ROOT_SETTINGS
		* @hide
		*/
		public static final int FLAG_HAS_SETTINGS = 1 << 18;
		public static final int FLAG_HAS_SETTINGS = 1 << 17;
		}

		/**

packages/DocumentsUI/res/menu/activity.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -83,10 +83,6 @@
		android:id="@+id/menu_file_size"
		android:showAsAction="never"
		android:visible="false" />
		<item
		android:id="@+id/menu_advanced"
		android:showAsAction="never"
		android:visible="false" />
		<item
		android:id="@+id/menu_settings"
		android:title="@string/menu_settings"

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@ public abstract class BaseActivity extends Activity
		final MenuItem sortSize = menu.findItem(R.id.menu_sort_size);
		final MenuItem grid = menu.findItem(R.id.menu_grid);
		final MenuItem list = menu.findItem(R.id.menu_list);
		final MenuItem advanced = menu.findItem(R.id.menu_advanced);
		final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

		// Search uses backend ranking; no sorting, recents doesn't support sort.
		@@ -163,9 +162,6 @@ public abstract class BaseActivity extends Activity
		grid.setVisible(mState.derivedMode != State.MODE_GRID);
		list.setVisible(mState.derivedMode != State.MODE_LIST);

		advanced.setVisible(!mState.forceAdvanced);
		advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this)
		? R.string.menu_advanced_hide : R.string.menu_advanced_show);
		fileSize.setTitle(LocalPreferences.getDisplayFileSize(this)
		? R.string.menu_file_size_hide : R.string.menu_file_size_show);

		@@ -201,10 +197,6 @@ public abstract class BaseActivity extends Activity
		state.forceSize = intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, false);
		state.showSize = state.forceSize \|\| LocalPreferences.getDisplayFileSize(this);

		state.forceAdvanced = intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, false);
		state.showAdvanced = state.forceAdvanced
		\|\| LocalPreferences.getDisplayAdvancedDevices(this);

		state.initAcceptMimes(intent);
		state.excludedAuthorities = getExcludedAuthorities();

		@@ -280,10 +272,6 @@ public abstract class BaseActivity extends Activity
		}
		return true;

		case R.id.menu_advanced:
		setDisplayAdvancedDevices(!LocalPreferences.getDisplayAdvancedDevices(this));
		return true;

		case R.id.menu_file_size:
		setDisplayFileSize(!LocalPreferences.getDisplayFileSize(this));
		return true;
		@@ -435,13 +423,6 @@ public abstract class BaseActivity extends Activity
		return mState;
		}

		void setDisplayAdvancedDevices(boolean display) {
		LocalPreferences.setDisplayAdvancedDevices(this, display);
		mState.showAdvanced = mState.forceAdvanced \| display;
		RootsFragment.get(getFragmentManager()).onDisplayStateChanged();
		invalidateOptionsMenu();
		}

		void setDisplayFileSize(boolean display) {
		LocalPreferences.setDisplayFileSize(this, display);
		mState.showSize = display;

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -98,12 +98,10 @@ public class DownloadsActivity extends BaseActivity {
		public boolean onPrepareOptionsMenu(Menu menu) {
		super.onPrepareOptionsMenu(menu);

		final MenuItem advanced = menu.findItem(R.id.menu_advanced);
		final MenuItem createDir = menu.findItem(R.id.menu_create_dir);
		final MenuItem pasteFromCb = menu.findItem(R.id.menu_paste_from_clipboard);
		final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

		advanced.setVisible(false);
		createDir.setVisible(false);
		pasteFromCb.setEnabled(false);
		fileSize.setVisible(false);