From 24cd592b2426a7c33231e2ecfdbe0722eb5957ce Mon Sep 17 00:00:00 2001
From: Steve McKay <smckay@google.com>
Date: Wed, 25 Jan 2017 10:19:06 -0800
Subject: [PATCH] DO NOT MERGE: Allow launcher icon to be config'd in overlay.

Bug: 34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
---
 packages/DocumentsUI/AndroidManifest.xml      |  8 +++----
 packages/DocumentsUI/res/values/drawables.xml | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 packages/DocumentsUI/res/values/drawables.xml

diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml
index a3edae35cc2b8..053755719c479 100644
--- a/packages/DocumentsUI/AndroidManifest.xml
+++ b/packages/DocumentsUI/AndroidManifest.xml
@@ -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>
diff --git a/packages/DocumentsUI/res/values/drawables.xml b/packages/DocumentsUI/res/values/drawables.xml
new file mode 100644
index 0000000000000..1c720e0b28e0e
--- /dev/null
+++ b/packages/DocumentsUI/res/values/drawables.xml
@@ -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>
+