Merge "[DocsUI M3] Rename PickFragment to PickDirectoryFragment" into main (bc43da0a) · Commits · e / os / android_packages_apps_DocumentsUI

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml→res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick_directory.xml

+0 −0

File moved.

src/com/android/documentsui/picker/PickActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {
		SaveFragment.show(getSupportFragmentManager(), mimeType, title);
		} else if (mState.action == ACTION_OPEN_TREE \|\|
		mState.action == ACTION_PICK_COPY_DESTINATION) {
		PickFragment.show(getSupportFragmentManager());
		PickDirectoryFragment.show(getSupportFragmentManager());
		} else if (!isUseMaterial3FlagEnabled()) {
		// If PickFragment or SaveFragment does not show,
		// Set save container background to transparent for edge to edge nav bar.
		@@ -415,7 +415,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {

		if (mState.action == ACTION_OPEN_TREE \|\|
		mState.action == ACTION_PICK_COPY_DESTINATION) {
		final PickFragment pick = PickFragment.get(fm);
		final PickDirectoryFragment pick = PickDirectoryFragment.get(fm);
		if (pick != null) {
		pick.setPickTarget(mState.action,
		mState.copyOperationSubType, mState.restrictScopeStorage, cwd);

src/com/android/documentsui/picker/PickFragment.java→src/com/android/documentsui/picker/PickDirectoryFragment.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -47,10 +47,10 @@ import com.android.documentsui.ui.Snackbars;
		import com.google.android.material.snackbar.Snackbar;

		/**
		* Display pick confirmation bar, usually for selecting a directory.
		* Display pick confirmation bar for selecting a directory.
		*/
		public class PickFragment extends Fragment {
		public static final String TAG = "PickFragment";
		public class PickDirectoryFragment extends Fragment {
		public static final String TAG = "PickDirectoryFragment";

		private static final String ACTION_KEY = "action";
		private static final String COPY_OPERATION_SUBTYPE_KEY = "copyOperationSubType";
		@@ -73,7 +73,7 @@ public class PickFragment extends Fragment {
		@Override
		public void onClick(View v) {
		mInjector.pickResult.increaseActionCount();
		final BaseActivity activity = BaseActivity.get(PickFragment.this);
		final BaseActivity activity = BaseActivity.get(PickDirectoryFragment.this);
		activity.setResult(FragmentActivity.RESULT_CANCELED);
		activity.finish();
		}
		@@ -97,20 +97,20 @@ public class PickFragment extends Fragment {
		return;
		}

		final PickFragment fragment = new PickFragment();
		final PickDirectoryFragment fragment = new PickDirectoryFragment();
		final FragmentTransaction ft = fm.beginTransaction();
		ft.replace(R.id.container_save, fragment, TAG);
		ft.commitNowAllowingStateLoss();
		}

		public static PickFragment get(FragmentManager fm) {
		return (PickFragment) fm.findFragmentByTag(TAG);
		public static PickDirectoryFragment get(FragmentManager fm) {
		return (PickDirectoryFragment) fm.findFragmentByTag(TAG);
		}

		@Override
		public View onCreateView(
		LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
		mContainer = inflater.inflate(R.layout.fragment_pick, container, false);
		mContainer = inflater.inflate(R.layout.fragment_pick_directory, container, false);

		mPick = (Button) mContainer.findViewById(android.R.id.button1);
		mPickOverlay = mContainer.findViewById((R.id.pick_button_overlay));