Import translations. DO NOT MERGE am: ea2a43b6e8 -s ours

am: 88b7063652  -s ours

Change-Id: I437b0ff577a3bae4d3df931a0d7955c84811adad

diff --git a/res/mipmap-anydpi/ic_launcher_gallery.xml b/res/mipmap-anydpi/ic_launcher_gallery.xml
new file mode 100644 (file)
index 0000000..c4e9e75
--- /dev/null
+++ b/res/mipmap-anydpi/ic_launcher_gallery.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_gallery_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_gallery_foreground"/>
+</adaptive-icon>
\ No newline at end of file

diff --git a/res/mipmap-hdpi/ic_launcher_gallery.png b/res/mipmap-hdpi/ic_launcher_gallery.png
deleted file mode 100644 (file)
index 23ea998..0000000
Binary files a/res/mipmap-hdpi/ic_launcher_gallery.png and /dev/null differ

diff --git a/res/mipmap-hdpi/ic_launcher_gallery_foreground.png b/res/mipmap-hdpi/ic_launcher_gallery_foreground.png
new file mode 100644 (file)
index 0000000..6db33c0
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_gallery_foreground.png differ

diff --git a/res/mipmap-mdpi/ic_launcher_gallery.png b/res/mipmap-mdpi/ic_launcher_gallery.png
deleted file mode 100644 (file)
index e1a9949..0000000
Binary files a/res/mipmap-mdpi/ic_launcher_gallery.png and /dev/null differ

diff --git a/res/mipmap-mdpi/ic_launcher_gallery_foreground.png b/res/mipmap-mdpi/ic_launcher_gallery_foreground.png
new file mode 100644 (file)
index 0000000..de2c3bf
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_gallery_foreground.png differ

diff --git a/res/mipmap-xhdpi/ic_launcher_gallery.png b/res/mipmap-xhdpi/ic_launcher_gallery.png
deleted file mode 100644 (file)
index 79544a2..0000000
Binary files a/res/mipmap-xhdpi/ic_launcher_gallery.png and /dev/null differ

diff --git a/res/mipmap-xhdpi/ic_launcher_gallery_foreground.png b/res/mipmap-xhdpi/ic_launcher_gallery_foreground.png
new file mode 100644 (file)
index 0000000..fb79d35
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_gallery_foreground.png differ

diff --git a/res/mipmap-xxhdpi/ic_launcher_gallery_foreground.png b/res/mipmap-xxhdpi/ic_launcher_gallery_foreground.png
new file mode 100644 (file)
index 0000000..691a1ca
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_gallery_foreground.png differ

diff --git a/res/mipmap-xxxhdpi/ic_launcher_gallery_foreground.png b/res/mipmap-xxxhdpi/ic_launcher_gallery_foreground.png
new file mode 100644 (file)
index 0000000..529f0ff
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_gallery_foreground.png differ

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4fe9180..f1fa300 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,6 +15,7 @@
 -->
 <resources>
     <color name="default_background">#000</color>
+    <color name="ic_launcher_gallery_background">#4285f4</color>
 
     <!-- configuration for album set page -->
     <color name="albumset_background">#1A1A1A</color>