Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b724523f authored by Tony Huang's avatar Tony Huang
Browse files

Update some behavior when rename file 

1. Dismiss dialog after rename task start.
2. Show rename error string on TextInputLayout.

Bug: 144898163
Test: manual
Test: atest DocumentsUIGoogleTests
Change-Id: If2e5a8979ad26b147744e0e832351b1e91b5afa1
parent ae5ed3a4

src/com/android/documentsui/dirlist/RenameDocumentFragment.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -46,7 +46,6 @@ import com.android.documentsui.base.Shared; 
import com.android.documentsui.ui.Snackbars;

import com.android.documentsui.ui.Snackbars;





import com.google.android.material.dialog.MaterialAlertDialogBuilder;

import com.google.android.material.dialog.MaterialAlertDialogBuilder;

import com.google.android.material.snackbar.Snackbar;

import com.google.android.material.textfield.TextInputLayout;

import com.google.android.material.textfield.TextInputLayout;





/**

/**
@@ -196,14 +195,19 @@ public class RenameDocumentFragment extends DialogFragment { 
            mDialog.dismiss();

            mDialog.dismiss();

        } else if (!isValidDocumentName(newDisplayName)) {

        } else if (!isValidDocumentName(newDisplayName)) {

            Log.w(TAG, "Failed to rename file - invalid name:" + newDisplayName);

            Log.w(TAG, "Failed to rename file - invalid name:" + newDisplayName);

            Snackbars.makeSnackbar(getActivity(), R.string.rename_error,

            mRenameInputWrapper.setError(getContext().getString(R.string.rename_error));

                    Snackbar.LENGTH_SHORT).show();

            Metrics.logRenameFileError();

        } else if (activity.getInjector().getModel().hasFileWithName(newDisplayName)){

        } else if (activity.getInjector().getModel().hasFileWithName(newDisplayName)){

            mRenameInputWrapper.setError(getContext().getString(R.string.name_conflict));

            mRenameInputWrapper.setError(getContext().getString(R.string.name_conflict));

            selectFileName(mEditText);

            selectFileName(mEditText);

            Metrics.logRenameFileError();

            Metrics.logRenameFileError();

        } else {

        } else {

            new RenameDocumentsTask(activity, newDisplayName).execute(mDocument);

            new RenameDocumentsTask(activity, newDisplayName).execute(mDocument);



            if (mDialog != null) {

                mDialog.dismiss();

            }

            activity.getInjector().selectionMgr.clearSelection();

        }

        }





    }

    }
@@ -232,10 +236,6 @@ public class RenameDocumentFragment extends DialogFragment { 
                Snackbars.showRenameFailed(mActivity);

                Snackbars.showRenameFailed(mActivity);

                Metrics.logRenameFileError();

                Metrics.logRenameFileError();

            }

            }

            if (mDialog != null) {

                mDialog.dismiss();

            }

            mActivity.getInjector().selectionMgr.clearSelection();

            mActivity.reloadDocumentsIfNeeded();

            mActivity.reloadDocumentsIfNeeded();

        }

        }

    }

    }