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

Commit 31f97bc4 authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Add support for renaming documents"

parents 6e3f3545 3b327ef9

packages/DocumentsUI/res/menu/mode_directory.xml

+5 −0
Original line number Diff line number Diff line
@@ -48,4 +48,9 @@ 
        android:title="@string/menu_move"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_rename"

        android:title="@string/menu_rename"

        android:showAsAction="never"

        android:visible="false" />

</menu>

packages/DocumentsUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -192,4 +192,8 @@ 
    </plurals>

    <!-- Toast shown when a user tries to paste files into an unsupported location. -->

    <string name="clipboard_files_cannot_paste">Cannot paste the selected files in this location.</string>

    <!-- Menu item that renames the selected document [CHAR LIMIT=24] -->

    <string name="menu_rename">Rename</string>

    <!-- Toast shown when renaming document failed with an error [CHAR LIMIT=48] -->

    <string name="rename_error">Failed to rename document</string>

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList 
        DirectoryFragment.get(getFragmentManager()).onUserModeChanged();

    }



    void setPending(boolean pending) {

    public void setPending(boolean pending) {

        final SaveFragment save = SaveFragment.get(getFragmentManager());

        if (save != null) {

            save.setPending(pending);

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class CreateDirectoryFragment extends DialogFragment { 
        final AlertDialog.Builder builder = new AlertDialog.Builder(context);

        final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());



        final View view = dialogInflater.inflate(R.layout.dialog_create_dir, null, false);

        final View view = dialogInflater.inflate(R.layout.dialog_file_name, null, false);

        final EditText editText = (EditText) view.findViewById(android.R.id.text1);



        builder.setTitle(R.string.menu_create_dir);