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

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

Allow icons to be overlayed via resource config. 

Since we've got got both Files and Download icons included
in the app now, there's no reasons for overlay's to replace
the Downloads icon with a Files app icon. This change will
allow them to overlay just the drawable mapping.

Bug: 30511480
Change-Id: I6e486ea81a18d0a07a8f1a8da51b1aab81ee9dd4
parent 64813822

AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 
    <application

        android:name=".DocumentsApplication"

        android:label="@string/app_label"

        android:icon="@mipmap/ic_app_icon"

        android:icon="@drawable/app_icon"

        android:supportsRtl="true">



        <activity

            android:name=".DocumentsActivity"

            android:theme="@style/DocumentsTheme"

            android:icon="@drawable/ic_doc_text">

            android:icon="@drawable/picker_icon">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -45,7 +45,7 @@ 
        <activity

            android:name=".LauncherActivity"

            android:label="@string/downloads_label"

            android:icon="@mipmap/ic_launcher_downloads"

            android:icon="@drawable/files_icon"

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

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -56,7 +56,7 @@ 
        <activity

            android:name=".FilesActivity"

            android:label="@string/downloads_label"

            android:icon="@mipmap/ic_launcher_downloads"

            android:icon="@drawable/files_icon"

            android:documentLaunchMode="intoExisting"

            android:theme="@style/DocumentsTheme">

            <intent-filter>

res/values/drawables.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

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

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

    <item name="picker_icon" type="drawable">@drawable/ic_doc_text</item>

</resources>