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

Commit cf2cc2b4 authored by Steve McKay's avatar Steve McKay
Browse files

Tidy resources related to app branding. 

Include in build strings for both Files and Downloads so they
get translated as part of the core app. Vendors can choose
which branding they want by simpling referencing the correct
@string/files_label or @string/downloads_label in an overlay.

Also, remove specific icon for Picker allowing it to fall back
to the app icon...visually a no-op.

Bug: 35212289
Test: Build install see "Downloads".
Change-Id: I604fef3b0ca8860db22925143350faec1996d983
(cherry picked from commit 8474059d)
parent 15ed8b2c

AndroidManifest.xml

+5 −8
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 


        <activity

            android:name=".picker.PickActivity"

            android:theme="@style/DocumentsTheme"

            android:icon="@drawable/picker_icon">

            android:theme="@style/DocumentsTheme">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -51,8 +50,8 @@ 


        <activity

            android:name=".files.LauncherActivity"

            android:label="@string/app_label"

            android:icon="@drawable/files_icon"

            android:label="@string/launcher_label"

            android:icon="@drawable/launcher_icon"

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

        </activity>
@@ -60,8 +59,8 @@ 
        <activity-alias

            android:name=".Launcher"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/app_label"

            android:icon="@drawable/files_icon" >

            android:label="@string/launcher_label"

            android:icon="@drawable/launcher_icon" >

            <intent-filter>

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

                <category android:name="android.intent.category.LAUNCHER" />
@@ -71,8 +70,6 @@ 


        <activity

            android:name=".files.FilesActivity"

            android:label="@string/app_label"

            android:icon="@drawable/files_icon"

            android:documentLaunchMode="intoExisting"

            android:theme="@style/DocumentsTheme">

            <intent-filter>

res/values/drawables.xml

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


<resources>

    <item name="app_icon" type="drawable">@mipmap/ic_app_icon</item>

    <item name="files_icon" type="drawable">@mipmap/ic_app_icon</item>

    <item name="picker_icon" type="drawable">@mipmap/ic_app_icon</item>

    <item name="launcher_icon" type="drawable">@mipmap/ic_app_icon</item>

    <item name="image_root_icon" type="drawable">@*android:drawable/ic_doc_image</item>

    <item name="video_root_icon" type="drawable">@*android:drawable/ic_doc_video</item>

    <item name="audio_root_icon" type="drawable">@*android:drawable/ic_doc_audio</item>

res/values/strings.xml

+10 −1
Original line number Diff line number Diff line
@@ -15,8 +15,17 @@ 
-->



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

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

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



    <!-- Title of the Downloads application, which sometimes Files is known as [CHAR LIMIT=32] -->

    <string name="downloads_label">Downloads</string>



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

    <string name="app_label">@string/files_label</string>



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

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

    <string name="launcher_label">@string/files_label</string>



    <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->

    <string name="title_open">Open from</string>