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

Commit ef496432 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '6677-s-fix_transaltion' into 'v1-s' 

DocumentsUI: use translation of files_label for all

See merge request !35
parents c8a64b50 fc987085

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


    <application

        android:name=".DocumentsApplication"

        android:label="@string/app_label"

        android:label="@string/files_label"

        android:icon="@mipmap/ic_launcher"

        android:supportsRtl="true"

        android:allowBackup="true"
@@ -84,7 +84,7 @@ 


        <activity

            android:name=".files.LauncherActivity"

            android:label="@string/launcher_label"

            android:label="@string/files_label"

            android:icon="@drawable/launcher_icon"

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

        </activity>
@@ -100,7 +100,7 @@ 
        <activity-alias

            android:name=".LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/launcher_label"

            android:label="@string/files_label"

            android:exported="true"

            android:icon="@drawable/launcher_icon" >

            <intent-filter>

src/com/android/documentsui/files/FilesActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler 
        Intent intent = getIntent();

        return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))

                ? intent.getStringExtra(Intent.EXTRA_TITLE)

                : getString(R.string.app_label);

                : getString(R.string.files_label);

    }



    @Override

src/com/android/documentsui/files/LauncherActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class LauncherActivity extends Activity { 
    private void startTask() {

        Intent intent = createLaunchIntent(this);



        intent.putExtra(TASK_LABEL_RES, R.string.launcher_label);

        intent.putExtra(TASK_LABEL_RES, R.string.files_label);

        intent.putExtra(TASK_ICON_RES, R.drawable.launcher_icon);



        // Forward any flags from the original intent.

src/com/android/documentsui/files/MenuManager.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public final class MenuManager extends com.android.documentsui.MenuManager { 
    public void updateKeyboardShortcutsMenu(

            List<KeyboardShortcutGroup> data, IntFunction<String> stringSupplier) {

        KeyboardShortcutGroup group = new KeyboardShortcutGroup(

                stringSupplier.apply(R.string.app_label));

                stringSupplier.apply(R.string.files_label));

        group.addItem(new KeyboardShortcutInfo(

                stringSupplier.apply(R.string.menu_cut_to_clipboard), KeyEvent.KEYCODE_X,

                KeyEvent.META_CTRL_ON));

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

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons { 
                    title = getResources().getString(R.string.title_save);

                } else {

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

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

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

                }

            }

        }