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

Commit c469585c authored by Daichi Hirono's avatar Daichi Hirono Committed by Android (Google) Code Review
Browse files

Merge "Change the title of DocumentsUI from "Files" to "Downloads"." into nyc-dev

parents 742983e7 2917fa9d

packages/DocumentsUI/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
            android:name=".LauncherActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:icon="@drawable/ic_files_app"

            android:label="@string/files_label">

            android:label="@string/downloads_label">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
@@ -56,7 +56,7 @@ 
            android:name=".FilesActivity"

            android:theme="@style/DocumentsTheme"

            android:icon="@drawable/ic_files_app"

            android:label="@string/files_label"

            android:label="@string/downloads_label"

            android:documentLaunchMode="intoExisting">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ public class DocumentsActivity extends BaseActivity { 
                       mState.action == ACTION_PICK_COPY_DESTINATION) {

                title = getResources().getString(R.string.title_save);

            } else {

                // If all else fails, just call it "Files".

                title = getResources().getString(R.string.files_label);

                // If all else fails, just call it "Downloads".

                title = getResources().getString(R.string.downloads_label);

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class FilesActivity extends BaseActivity { 


    @Override

    public String getDrawerTitle() {

        return getResources().getString(R.string.files_label);

        return getResources().getString(R.string.downloads_label);

    }



    @Override

packages/MtpDocumentsProvider/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Title of the external storage application [CHAR LIMIT=32] -->

    <string name="app_label">Files</string>

    <string name="app_label">MTP Host</string>

    <!-- Name of MTP root shown in UI. Please align the two strings (device

         model and storage name) in proper order in the language.

         [CHAR LIMIT=32] -->