• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

packages/apps/Gallery2


Commit MetaInfo

修订版4e0c4861f9f0d2e3d6f69b520d132c22008b48dd (tree)
时间2017-12-07 07:24:53
作者Xin Li <delphij@goog...>
CommiterXin Li

Log Message

DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I02acbb1837baccf6537a0e2d7cafcfdf053ef3ca

更改概述

差异

--- /dev/null
+++ b/res/mipmap-anydpi/ic_launcher_gallery.xml
@@ -0,0 +1,19 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<!-- Copyright (C) 2017 The Android Open Source Project
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
17+ <background android:drawable="@color/ic_launcher_gallery_background"/>
18+ <foreground android:drawable="@mipmap/ic_launcher_gallery_foreground"/>
19+</adaptive-icon>
\ No newline at end of file
Binary files a/res/mipmap-hdpi/ic_launcher_gallery.png and /dev/null differ
Binary files a/res/mipmap-mdpi/ic_launcher_gallery.png and /dev/null differ
Binary files a/res/mipmap-xhdpi/ic_launcher_gallery.png and /dev/null differ
--- a/res/values-in/filtershow_strings.xml
+++ b/res/values-in/filtershow_strings.xml
@@ -33,7 +33,7 @@
3333 <string name="export_image" msgid="3202835713172222134">"Ekspor"</string>
3434 <string name="print_image" msgid="1942989216591621413">"Cetak"</string>
3535 <string name="export_flattened" msgid="9046192331465915411">"Ekspor Gambar yang Dipipihkan"</string>
36- <string name="select_output_settings" msgid="1268532018080310748">"Gambar yang diekspor akan berupa salinan, tanpa riwayat."</string>
36+ <string name="select_output_settings" msgid="1268532018080310748">"Gambar yang diekspor akan berupa salinan, tanpa histori."</string>
3737 <string name="quality" msgid="179292110309050529">"Kualitas"</string>
3838 <string name="size" msgid="4639404642236356037">"Ukuran"</string>
3939 <string name="x" msgid="6810256999024563662">"x"</string>
@@ -43,7 +43,7 @@
4343 <string name="save_and_exit" msgid="3628425023766687419">"Simpan dan Keluar"</string>
4444 <string name="save_and_processing" msgid="6371565035837463194">"Memproses gambar resolusi penuh..."</string>
4545 <string name="exit" msgid="242642957038770113">"Keluar"</string>
46- <string name="history" msgid="455767361472692409">"Riwayat"</string>
46+ <string name="history" msgid="455767361472692409">"Histori"</string>
4747 <string name="reset" msgid="9013181350779592937">"Setel Ulang"</string>
4848 <!-- no translation found for history_original (150973253194312841) -->
4949 <skip />
--- a/res/values-mr/filtershow_strings.xml
+++ b/res/values-mr/filtershow_strings.xml
@@ -17,7 +17,7 @@
1717 <resources xmlns:android="http://schemas.android.com/apk/res/android"
1818 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1919 <string name="title_activity_filter_show" msgid="2036539130684382763">"फोटो संपादक"</string>
20- <string name="cannot_load_image" msgid="5023634941212959976">"प्रतिमा लोड करु शकत नाही!"</string>
20+ <string name="cannot_load_image" msgid="5023634941212959976">"इमेज लोड करु शकत नाही!"</string>
2121 <string name="cannot_edit_original" msgid="5890293845882609388">"मूळ संपादित करू शकत नाही"</string>
2222 <!-- no translation found for original_picture_text (3076213290079909698) -->
2323 <skip />
@@ -32,16 +32,16 @@
3232 <string name="hide_imagestate_panel" msgid="7207643485811695257">"लागू केलेले प्रभाव लपवा"</string>
3333 <string name="export_image" msgid="3202835713172222134">"निर्यात"</string>
3434 <string name="print_image" msgid="1942989216591621413">"मुद्रण करा"</string>
35- <string name="export_flattened" msgid="9046192331465915411">"सपाट केलेली प्रतिमा निर्यात करा"</string>
36- <string name="select_output_settings" msgid="1268532018080310748">"निर्यात केलेली प्रतिमा इतिहासाशिवाय एक प्रतिलिपी असेल."</string>
35+ <string name="export_flattened" msgid="9046192331465915411">"सपाट केलेली इमेज निर्यात करा"</string>
36+ <string name="select_output_settings" msgid="1268532018080310748">"निर्यात केलेली इमेज इतिहासाशिवाय एक प्रतिलिपी असेल."</string>
3737 <string name="quality" msgid="179292110309050529">"गुणवत्ता"</string>
3838 <string name="size" msgid="4639404642236356037">"आकार"</string>
3939 <string name="x" msgid="6810256999024563662">"x"</string>
4040 <string name="menu_settings" msgid="6428291655769260831">"सेटिंग्ज"</string>
4141 <string name="unsaved" msgid="8704442449002374375">"या प्रतिमेवर जतन न केलेले बदल आहेत."</string>
4242 <string name="save_before_exit" msgid="2680660633675916712">"निर्गमन करण्यापूर्वी आपण जतन करु इच्छिता?"</string>
43- <string name="save_and_exit" msgid="3628425023766687419">"जतन करा आणि बाहेर पडा"</string>
44- <string name="save_and_processing" msgid="6371565035837463194">"संपूर्ण रिजोल्यूशन प्रतिमेवर प्रक्रिया करीत आहे..."</string>
43+ <string name="save_and_exit" msgid="3628425023766687419">"सेव्ह करा आणि बाहेर पडा"</string>
44+ <string name="save_and_processing" msgid="6371565035837463194">"संपूर्ण रिजोल्यूशन प्रतिमेवर प्रक्रिया करत आहे..."</string>
4545 <string name="exit" msgid="242642957038770113">"निर्गमन करा"</string>
4646 <string name="history" msgid="455767361472692409">"इतिहास"</string>
4747 <string name="reset" msgid="9013181350779592937">"रीसेट करा"</string>
@@ -129,14 +129,14 @@
129129 <string name="draw_size_accept" msgid="6781529716526190028">"ठीक आहे"</string>
130130 <string name="state_panel_original" msgid="9069584409934164419">"मूळ"</string>
131131 <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
132- <string name="filtershow_notification_label" msgid="1653168445525855247">"प्रतिमा जतन करीत आहे"</string>
132+ <string name="filtershow_notification_label" msgid="1653168445525855247">"इमेज जतन करत आहे"</string>
133133 <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रक्रिया करत आहे..."</string>
134- <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट जतन करा"</string>
134+ <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट सेव्ह करा"</string>
135135 <string name="filtershow_manage_preset" msgid="3872896753708921286">"वापरकर्ता प्रीसेट व्यवस्थापित करा"</string>
136136 <string name="filtershow_new_preset" msgid="8923930134923416617">"नवीन प्रीसेट"</string>
137137 <string name="filtershow_preset_name" msgid="7015939727047649866">"प्रीसेट नाव"</string>
138138 <string name="filtershow_show_info_panel" msgid="5773036746043711115">"माहिती"</string>
139- <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"प्रतिमा नाव"</string>
139+ <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"इमेज नाव"</string>
140140 <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"प्र‍तिमा आकार"</string>
141141 <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"हिस्टोग्राम"</string>
142142 <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF डेटा"</string>
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,6 +15,7 @@
1515 -->
1616 <resources>
1717 <color name="default_background">#000</color>
18+ <color name="ic_launcher_gallery_background">#4285f4</color>
1819
1920 <!-- configuration for album set page -->
2021 <color name="albumset_background">#1A1A1A</color>