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

Bug: 34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
This commit is contained in:
Steve McKay
2017-01-25 10:19:06 -08:00
parent 5bfedd8af0
commit 24cd592b24
2 changed files with 26 additions and 4 deletions

View File

@@ -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>

View File

@@ -0,0 +1,22 @@
<?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>