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

Commit f9e2dea5 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 e8609136 91252b8f

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" />

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

            }

        }

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