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

Commit 16037272 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update string for OPEN_DOCUMENT_TREE flow"

parents fd216384 27011967

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -462,11 +462,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>

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

+3 −3
Original line number Diff line number Diff line
@@ -86,10 +86,10 @@ public class ConfirmFragment extends DialogFragment { 
                        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);

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

+1 −7
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.documentsui.services.FileOperationService.OPERATION_MO 
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 @@ public class PickFragment extends Fragment { 


        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());