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

Commit fd216384 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Update sub header string in storage type root"

parents 40930031 915be1e2

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ 
    <string name="root_info_header_downloads">Files in Downloads</string>

    <!-- Header title for list of documents in storage type root. [CHAR_LIMIT=60] -->

    <string name="root_info_header_storage">Files on <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>

    <!-- Header title for list of documents in folder. [CHAR_LIMIT=60] -->

    <string name="root_info_header_folder">Files in <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>

    <!-- Header title for list of documents 3rd party provider root eg. Drive, Box. [CHAR_LIMIT=60] -->

    <string name="root_info_header_app">Files from <xliff:g id="label" example="Drive">%1$s</xliff:g></string>

    <!-- Header title for list of documents 3rd party provider root eg. Drive, Box. with root summary. The summary is usually present by email account[CHAR_LIMIT=60] -->
@@ -426,6 +428,8 @@ 
    <string name="root_info_header_image_downloads">Images in Downloads</string>

    <!-- On photo picking state, the header title for list of documents in storage type root. [CHAR_LIMIT=60] -->

    <string name="root_info_header_image_storage">Images on <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>

    <!-- On photo picking state, the header title for list of documents in folder. [CHAR_LIMIT=60] -->

    <string name="root_info_header_image_folder">Images in <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>

    <!-- On photo picking state, the header title for list of documents 3rd party provider root eg. Drive, Box. [CHAR_LIMIT=60] -->

    <string name="root_info_header_image_app">Images from <xliff:g id="label" example="Drive">%1$s</xliff:g></string>

    <!-- On photo picking state, the header title for list of documents 3rd party provider root eg. Drive, Box. with root summary. The summary is usually present by email account[CHAR_LIMIT=60] -->

src/com/android/documentsui/BaseActivity.java

+9 −3
Original line number Diff line number Diff line
@@ -726,10 +726,16 @@ public abstract class BaseActivity 
    }



    private String getHeaderStorageTitle(String rootTitle) {

        if (mState.stack.size() > 1) {

            final int resId = mState.isPhotoPicking()

                    ? R.string.root_info_header_image_folder : R.string.root_info_header_folder;

            return getString(resId, getCurrentTitle());

        } else {

            final int resId = mState.isPhotoPicking()

                    ? R.string.root_info_header_image_storage : R.string.root_info_header_storage;

            return getString(resId, rootTitle);

        }

    }



    private String getHeaderDefaultTitle(String rootTitle, String summary) {

        if (TextUtils.isEmpty(summary)) {