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

Commit 1552895f authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

DO NOT MERGE: Allow launcher icon to be config'd in overlay. 

am: 24cd592b

Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b
parents ded1df24 24cd592b

packages/DocumentsUI/AndroidManifest.xml

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

    <application

        android:name=".DocumentsApplication"

        android:name=".DocumentsApplication"

        android:label="@string/app_label"

        android:label="@string/app_label"

        android:icon="@mipmap/ic_app_icon"

        android:icon="@drawable/app_icon"

        android:supportsRtl="true">

        android:supportsRtl="true">





        <activity

        <activity

            android:name=".DocumentsActivity"

            android:name=".DocumentsActivity"

            android:theme="@style/DocumentsTheme"

            android:theme="@style/DocumentsTheme"

            android:icon="@drawable/ic_doc_text">

            android:icon="@drawable/picker_icon">

            <intent-filter>

            <intent-filter>

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

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

                <category android:name="android.intent.category.DEFAULT" />

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

        <activity

            android:name=".LauncherActivity"

            android:name=".LauncherActivity"

            android:label="@string/downloads_label"

            android:label="@string/downloads_label"

            android:icon="@mipmap/ic_launcher_downloads"

            android:icon="@drawable/files_icon"

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

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

            <intent-filter>

            <intent-filter>

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

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

        <activity

            android:name=".FilesActivity"

            android:name=".FilesActivity"

            android:label="@string/downloads_label"

            android:label="@string/downloads_label"

            android:icon="@mipmap/ic_launcher_downloads"

            android:icon="@drawable/files_icon"

            android:documentLaunchMode="intoExisting"

            android:documentLaunchMode="intoExisting"

            android:theme="@style/DocumentsTheme">

            android:theme="@style/DocumentsTheme">

            <intent-filter>

            <intent-filter>

packages/DocumentsUI/res/values/drawables.xml

0 → 100644
+22 −0
Original line number Original line 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">@mipmap/ic_launcher_downloads</item>

</resources>