Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add logic for selecting filename in RenameDocumentFragment - different selection for directory. Prevent test from creating directories in Documents folder." into nyc-dev

Browse Source 
am: f4b808345d

* commit 'f4b808345d38e7f1c0390bf223c3455bfb2fe21f':
  Add logic for selecting filename in RenameDocumentFragment - different selection for directory. Prevent test from creating directories in Documents folder.
This commit is contained in:
Aga Wronska
2016-02-23 19:21:00 +00:00
committed by android-build-merger
parent d39f57e0a7 f4b808345d
commit 6e09e0a77a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
View File

@@ -163,7 +163,8 @@ public class RenameDocumentFragment extends DialogFragment {
private void selectFileName(EditText editText) {
String text = editText.getText().toString();
int separatorIndex = text.indexOf(".");
editText.setSelection(0, separatorIndex == -1 ? text.length() : separatorIndex);
editText.setSelection(0,
(separatorIndex == -1 || mDocument.isDirectory()) ? text.length() : separatorIndex);
}
/**

2
packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
View File

@@ -92,6 +92,8 @@ public class FilesActivityUiTest extends ActivityTest<FilesActivity> {
public void testCreateDirectory() throws Exception {
initTestFiles();
bots.roots.openRoot(ROOT_0_ID);
bots.main.openOverflowMenu();
bots.main.menuNewFolder().click();
bots.main.setDialogText("Kung Fu Panda");