Update string for OPEN_DOCUMENT_TREE flow
Update button string, dialog title and dialog content for new UI design.
Bug: 141600696
Bug: 141921068
Test: manual
Test: atest DocumentsUIGoogleTests
Change-Id: I92075155040b7247487429e2f34e19dba5d09962
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 99db0c8..1c57975 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -458,11 +458,11 @@
<!-- The default name to present the anonymous application-->
<string name="anonymous_application">Anonymous</string>
<!-- Button text show on open document tree flow. [CHAR_LIMIT=48] -->
- <string name="open_tree_button">Allow access to \"<xliff:g id="directory" example="DCIM">%1$s</xliff:g>\"</string>
+ <string name="open_tree_button">Use this folder</string>
<!-- Confrim dialog title show on open document tree flow. [CHAR_LIMIT=60] -->
- <string name="open_tree_dialog_title">Allow access to \"<xliff:g id="directory" example="DCIM">%1$s</xliff:g>\" in \"<xliff:g id="root" example="SD card">%2$s</xliff:g>\"?</string>
+ <string name="open_tree_dialog_title">Allow <xliff:g id="appName" example="Drive">%1$s</xliff:g> to access files in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>?</string>
<!-- Confrim dialog message show on open document tree flow.-->
- <string name="open_tree_dialog_message">It will allow \"<xliff:g id="appName" example="Drive">%1$s</xliff:g>\" to have full access to all files currently stored under this location, and any future content stored here.</string>
+ <string name="open_tree_dialog_message">This will let <xliff:g id="appName" example="Drive">%1$s</xliff:g> access current and future content stored in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>.</string>
<!-- Search hint on search view. [CHAR LIMIT=48] -->
<string name="search_bar_hint">Search this phone</string>
diff --git a/src/com/android/documentsui/picker/ConfirmFragment.java b/src/com/android/documentsui/picker/ConfirmFragment.java
index f56434d..860a7ac 100644
--- a/src/com/android/documentsui/picker/ConfirmFragment.java
+++ b/src/com/android/documentsui/picker/ConfirmFragment.java
@@ -86,10 +86,10 @@
mTarget.authority, mTarget.documentId);
final BaseActivity activity = (BaseActivity) getActivity();
final String target = activity.getCurrentTitle();
- final String location = activity.getCurrentRoot().title;
- final String text = getString(R.string.open_tree_dialog_title, target, location);
+ final String text = getString(R.string.open_tree_dialog_title,
+ getAppName(getActivity().getCallingPackage()), target);
message = getString(R.string.open_tree_dialog_message,
- getAppName(getActivity().getCallingPackage()));
+ getAppName(getActivity().getCallingPackage()), target);
builder.setTitle(text);
builder.setMessage(message);
diff --git a/src/com/android/documentsui/picker/PickFragment.java b/src/com/android/documentsui/picker/PickFragment.java
index d61e874..1156882 100644
--- a/src/com/android/documentsui/picker/PickFragment.java
+++ b/src/com/android/documentsui/picker/PickFragment.java
@@ -24,7 +24,6 @@
import static com.android.documentsui.services.FileOperationService.OPERATION_UNKNOWN;
import android.os.Bundle;
-import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -164,12 +163,7 @@
switch (mAction) {
case State.ACTION_OPEN_TREE:
- final BaseActivity activity = (BaseActivity) getActivity();
- final String target = activity.getCurrentTitle();
- final String text = TextUtils.isEmpty(target)
- ? getString(R.string.button_select)
- : getString(R.string.open_tree_button, target);
- mPick.setText(text);
+ mPick.setText(getString(R.string.open_tree_button));
mPick.setWidth(Integer.MAX_VALUE);
mCancel.setVisibility(View.GONE);
mPick.setEnabled(!mPickTarget.isBlockedFromTree());