OSDN Git Service

android-x86/packages-apps-Gallery2.git
6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9 -s ours am: 3b441660e8
Xin Li [Thu, 7 Dec 2017 21:34:34 +0000 (21:34 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours am: 3b441660e8
am: ea0cde1302  -s ours

Change-Id: I2f6f5a1a9bd7d7cfec92539c7a8cc2f9b5185683

6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9 -s ours
Xin Li [Thu, 7 Dec 2017 07:01:14 +0000 (07:01 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours
am: 3b441660e8

Change-Id: Ibaa570574d94d53a31c8f04447b5c658a5203899

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Thu, 7 Dec 2017 04:32:52 +0000 (04:32 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am: 4e0c4861f9  -s ours

Change-Id: I0131132b59eb621fc272d31c51b1fc6ab9d91a2a

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
Xin Li [Wed, 6 Dec 2017 19:52:08 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Dec 2017 06:15:17 +0000 (22:15 -0800)]
Import translations. DO NOT MERGE

Change-Id: If0f5f6428a44689048da16d2844434fca098f6ae
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE am: b0d5c3ef71 -s ours
Bill Yi [Thu, 30 Nov 2017 01:55:53 +0000 (01:55 +0000)]
Import translations. DO NOT MERGE am: b0d5c3ef71  -s ours
am: 1de15fa587  -s ours

Change-Id: Iafd2ca284b37da3bc9c88bbe9f28f9b5ce979fab

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 01:47:05 +0000 (01:47 +0000)]
Import translations. DO NOT MERGE
am: b0d5c3ef71  -s ours

Change-Id: Icad712b1ee9f1282264754f42fbf2acfe0f5e45e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 00:05:36 +0000 (16:05 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I9ccf023b651d9b891d148f75abcefc39265fa7a9

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 20 Nov 2017 21:28:34 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:43:57 +0000 (11:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: I020947cba5c9b06b250f97a73d2821fb4d884e5c
Auto-generated-cl: translation import

6 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Xin Li [Wed, 15 Nov 2017 02:12:41 +0000 (02:12 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: f4015395a8

Change-Id: Ib42faf5cb6c015927434dcaf3367882a859c46f2

6 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Xin Li [Wed, 15 Nov 2017 00:38:22 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I8d0a6b7edb32c8a300bce902df909395f61f4373

6 years agoMerge commit '9c045e49152040db37c827c238bbb7a4400bec1e' into HEAD
Xin Li [Mon, 13 Nov 2017 22:35:42 +0000 (14:35 -0800)]
Merge commit '9c045e49152040db37c827c238bbb7a4400bec1e' into HEAD

Change-Id: Ia58699cd527c0851868f948e4aa2def40f15223c

6 years agoMerge "Use -Werror in packages/apps/Gallery2" am: 24309021fb am: 5b7d5244e9
Chih-hung Hsieh [Fri, 3 Nov 2017 00:53:07 +0000 (00:53 +0000)]
Merge "Use -Werror in packages/apps/Gallery2" am: 24309021fb am: 5b7d5244e9
am: ce684cfa6c

Change-Id: Ic07c2a734f0a634458d3c9e50b5877209434ef51

6 years agoMerge "Use -Werror in packages/apps/Gallery2" am: 24309021fb
Chih-hung Hsieh [Fri, 3 Nov 2017 00:49:34 +0000 (00:49 +0000)]
Merge "Use -Werror in packages/apps/Gallery2" am: 24309021fb
am: 5b7d5244e9

Change-Id: Ie45c3b38637a28be789d318c3c740c782f2131f2

6 years agoMerge "Use -Werror in packages/apps/Gallery2"
Chih-hung Hsieh [Fri, 3 Nov 2017 00:47:09 +0000 (00:47 +0000)]
Merge "Use -Werror in packages/apps/Gallery2"
am: 24309021fb

Change-Id: Iee490c18f1d60f20ba19e304614c01fe481ff0d8

6 years agoMerge "Use -Werror in packages/apps/Gallery2"
Chih-hung Hsieh [Fri, 3 Nov 2017 00:45:35 +0000 (00:45 +0000)]
Merge "Use -Werror in packages/apps/Gallery2"

6 years agoUse -Werror in packages/apps/Gallery2
Chih-Hung Hsieh [Thu, 2 Nov 2017 17:24:36 +0000 (10:24 -0700)]
Use -Werror in packages/apps/Gallery2

* Keep constant-conversion warnings to fix later.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ib93e954e025fd2f0202960df20583b50b97fce7f

6 years agoImport translations. DO NOT MERGE am: ea2a43b6e8 -s ours am: 88b7063652 -s ours
Bill Yi [Fri, 20 Oct 2017 17:43:36 +0000 (17:43 +0000)]
Import translations. DO NOT MERGE am: ea2a43b6e8  -s ours am: 88b7063652  -s ours
am: ebc9696ac4  -s ours

Change-Id: Ia39f46a1548d505e872b0860283b242fba4fda57

6 years agoImport translations. DO NOT MERGE am: ea2a43b6e8 -s ours
Bill Yi [Fri, 20 Oct 2017 17:13:29 +0000 (17:13 +0000)]
Import translations. DO NOT MERGE am: ea2a43b6e8  -s ours
am: 88b7063652  -s ours

Change-Id: I437b0ff577a3bae4d3df931a0d7955c84811adad

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 16:37:57 +0000 (16:37 +0000)]
Import translations. DO NOT MERGE
am: ea2a43b6e8  -s ours

Change-Id: Id907dec92e7cd33035e0695010b8bbc016cc375a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 08:17:10 +0000 (01:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I15f53f564cf5f783d6b8c8c8b44e2494392be612

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours am: 21391848ee -s ours
Bill Yi [Tue, 17 Oct 2017 09:14:34 +0000 (09:14 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours am: 21391848ee  -s ours
am: 9c045e4915  -s ours

Change-Id: Icc2fe0a4c3d03a3a46133bc8aaf6e7464b7252a2

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours am: ee12640ce1 -s ours
Bill Yi [Tue, 17 Oct 2017 09:14:23 +0000 (09:14 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours am: ee12640ce1  -s ours
am: 0c29f659b4  -s ours

Change-Id: I75ac8030007d071ce57a46e427e669d3babc72e0

6 years agoImport translations. DO NOT MERGE am: 3739f191c2 -s ours
Bill Yi [Tue, 17 Oct 2017 09:14:11 +0000 (09:14 +0000)]
Import translations. DO NOT MERGE am: 3739f191c2  -s ours
am: cd341ba7dd  -s ours

Change-Id: Idb51f0fbc0a25421f148d574b9498702e50f12e0

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours
Bill Yi [Tue, 17 Oct 2017 05:38:47 +0000 (05:38 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours
am: 21391848ee  -s ours

Change-Id: I3294299d838ad88536770d543478cdc80dd24a54

6 years agoImport translations. DO NOT MERGE am: 7367f4e5a3 -s ours
Bill Yi [Tue, 17 Oct 2017 03:34:10 +0000 (03:34 +0000)]
Import translations. DO NOT MERGE am: 7367f4e5a3  -s ours
am: ee12640ce1  -s ours

Change-Id: I23c2a27af9c198036acb7e1341813e4845242f4c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 03:33:57 +0000 (03:33 +0000)]
Import translations. DO NOT MERGE
am: 3739f191c2  -s ours

Change-Id: Ie1a5d3a490623dca3927b67ba1c8987bff818de9

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 02:19:26 +0000 (02:19 +0000)]
Import translations. DO NOT MERGE
am: 7367f4e5a3  -s ours

Change-Id: I7dbfbb757a7cba4e52d980cd3da96da0339628f5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 02:08:52 +0000 (02:08 +0000)]
Import translations. DO NOT MERGE
am: 7367f4e5a3  -s ours

Change-Id: I5a557b021286b4f2ebe2fc9c934c56aeabe59c70

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Oct 2017 07:06:29 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I5280cc386023aa6e501dfb2b822341a5491726c6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Oct 2017 07:05:07 +0000 (00:05 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia18d76d34b86caba45dcba0d61cd006bb2f47352

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 2 Oct 2017 03:40:33 +0000 (20:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib779fab343e62b93e17e7317f7b88a30ea2c013d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoFix build with proguard
Colin Cross [Mon, 25 Sep 2017 20:40:55 +0000 (13:40 -0700)]
Fix build with proguard

Add extra resource directories to fix proguard errors:
Warning: android.support.design.widget.CoordinatorLayout: can't find referenced class android.support.coreui.R$attr
...
Warning: android.support.v4.media.app.NotificationCompat$DecoratedMediaCustomViewStyle: can't find referenced class android.support.mediacompat.R$layout

Test: m TARGET_PRODUCT=full TARGET_BUILD_VARIANT=userdebug TARGET_BUILD_APPS=Gallery2
Change-Id: Idf556a2eea6af37a4f1f9e9cf337485ae228ff58

6 years agoImport translations. DO NOT MERGE am: ace22e9966 -s ours
Bill Yi [Sat, 16 Sep 2017 21:02:12 +0000 (21:02 +0000)]
Import translations. DO NOT MERGE am: ace22e9966  -s ours
am: c9e9e99f9c  -s ours

Change-Id: I0d7e0a7b2ad46399eede79f56ab96d11b0106156

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 20:57:51 +0000 (20:57 +0000)]
Import translations. DO NOT MERGE
am: ace22e9966  -s ours

Change-Id: I968d7228ca3c58a2c075e129b8198d26204aff98

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 15:23:40 +0000 (08:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I750741edd2447f4d5d23e5ec9880c5fd5684d87e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 11:44:31 +0000 (04:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I824453e305d0203c2ad906538a8977efa790235e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 647d252538 -s ours
Bill Yi [Wed, 30 Aug 2017 03:46:41 +0000 (03:46 +0000)]
Import translations. DO NOT MERGE am: 647d252538  -s ours
am: 5333f048d1  -s ours

Change-Id: I68e5f4b407a4f4367f480685dbbf55c5e77e9d68

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 00:51:56 +0000 (00:51 +0000)]
Import translations. DO NOT MERGE
am: 647d252538  -s ours

Change-Id: I62d554a59eb8e710fdd5e8181f77ec59e1e2e54d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 29 Aug 2017 20:22:18 +0000 (13:22 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia0e39ed10e58d6ac92e90809c6a4bf90507c0ed4

6 years agoAdaptive icon for Gallery2 AOSP Bug: 64333648 Test: manual am: e1febea9aa
Hyunyoung Song [Tue, 15 Aug 2017 23:29:14 +0000 (23:29 +0000)]
Adaptive icon for Gallery2 AOSP Bug: 64333648 Test: manual am: e1febea9aa
am: f5a088d2a0

Change-Id: If2ddb41f70db6779bcc748dcf60946e25d83fe7f

6 years agoAdaptive icon for Gallery2 AOSP Bug: 64333648 Test: manual
Hyunyoung Song [Tue, 15 Aug 2017 23:04:50 +0000 (23:04 +0000)]
Adaptive icon for Gallery2 AOSP Bug: 64333648 Test: manual
am: e1febea9aa

Change-Id: Ie51133dfaf300dbddbb4bf1e2413cb4868f6fb35

6 years agoAdaptive icon for Gallery2 AOSP
Hyunyoung Song [Tue, 15 Aug 2017 18:28:11 +0000 (11:28 -0700)]
Adaptive icon for Gallery2 AOSP
Bug: 64333648
Test: manual

Change-Id: Ifec26c6e5598ab31a73e4e7f090a843f10f63fef

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 Aug 2017 11:50:53 +0000 (04:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic5a3c4a53b2c6f68d9eb4a4f6af7332e734117ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 65cdfbaad6 -s ours am: 17dbc1ab21 -s ours...
Bill Yi [Mon, 7 Aug 2017 06:36:21 +0000 (06:36 +0000)]
Import translations. DO NOT MERGE am: 65cdfbaad6  -s ours am: 17dbc1ab21  -s ours am: f9fbbbc49c  -s ours
am: 1f06df1d1d  -s ours

Change-Id: I61d4bf178076dcd5b7661f6df247d0f194383724

6 years agoImport translations. DO NOT MERGE am: 65cdfbaad6 -s ours am: 17dbc1ab21 -s ours
Bill Yi [Mon, 7 Aug 2017 06:21:11 +0000 (06:21 +0000)]
Import translations. DO NOT MERGE am: 65cdfbaad6  -s ours am: 17dbc1ab21  -s ours
am: f9fbbbc49c  -s ours

Change-Id: I65a3c853d49ba5941dd60bd8b20e487054cfac50

6 years agoImport translations. DO NOT MERGE am: 65cdfbaad6 -s ours
Bill Yi [Mon, 7 Aug 2017 06:01:29 +0000 (06:01 +0000)]
Import translations. DO NOT MERGE am: 65cdfbaad6  -s ours
am: 17dbc1ab21  -s ours

Change-Id: Ia9edc4cc8d565d853d3a379284d3704568dd83e1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 7 Aug 2017 05:49:12 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE
am: 65cdfbaad6  -s ours

Change-Id: Ife5284b2e8bb1b0a92db05e6d698ad8d3522c60e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 18:00:21 +0000 (11:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibb7caa525515c43a8f68edf67815155359ed8734
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: ae8462585c -s ours
Bill Yi [Sun, 6 Aug 2017 07:13:02 +0000 (07:13 +0000)]
Import translations. DO NOT MERGE am: ae8462585c  -s ours
am: 5dcf0ebaf4  -s ours

Change-Id: I3305e122efa0f6a5d4cf4e98dbe55868409ae09e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 07:06:01 +0000 (07:06 +0000)]
Import translations. DO NOT MERGE
am: ae8462585c  -s ours

Change-Id: I62046fd6a1e7ac2b9393e92fb974b97026af81e6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 04:32:22 +0000 (21:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4f5f38b27a36d54517961726cc38da167d3bff22
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 97df95ca14 -s ours am: 5bec8c451b -s ours
Bill Yi [Sat, 5 Aug 2017 03:18:14 +0000 (03:18 +0000)]
Import translations. DO NOT MERGE am: 97df95ca14  -s ours am: 5bec8c451b  -s ours
am: 738d700fe4  -s ours

Change-Id: I410aff9925fdc37dab72a90ee9610ccde08f3b02

6 years agoImport translations. DO NOT MERGE am: 97df95ca14 -s ours am: 2d0da7589f -s ours
Bill Yi [Sat, 5 Aug 2017 03:18:03 +0000 (03:18 +0000)]
Import translations. DO NOT MERGE am: 97df95ca14  -s ours am: 2d0da7589f  -s ours
am: bdd61606c2  -s ours

Change-Id: Ib53f4758d39666f8d649f8e68f2559e003e96273

6 years agoImport translations. DO NOT MERGE am: 97df95ca14 -s ours
Bill Yi [Sat, 5 Aug 2017 03:12:03 +0000 (03:12 +0000)]
Import translations. DO NOT MERGE am: 97df95ca14  -s ours
am: 5bec8c451b  -s ours

Change-Id: I2af434f3f93953064551af9e7a75a862fff7bc84

6 years agoImport translations. DO NOT MERGE am: 97df95ca14 -s ours
Bill Yi [Sat, 5 Aug 2017 03:06:02 +0000 (03:06 +0000)]
Import translations. DO NOT MERGE am: 97df95ca14  -s ours
am: 2d0da7589f  -s ours

Change-Id: I58e4ff61bb497561d9b942ff46a1572263ec7421

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 02:58:42 +0000 (02:58 +0000)]
Import translations. DO NOT MERGE
am: 97df95ca14  -s ours

Change-Id: Ic10b2ff0619f499aa8e9810837160dff6bd9b4c4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 02:58:14 +0000 (02:58 +0000)]
Import translations. DO NOT MERGE
am: 97df95ca14  -s ours

Change-Id: Iacf5956b32af69fc27363d645dbb7a35551b8a6f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 4 Aug 2017 22:56:51 +0000 (15:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0c0ee330a3f53baaa04d0ea6c826cd1752ef1f03
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 07:41:52 +0000 (00:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: I05fe573f43885b99466f3475637481b775daedcc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMove <permission> tags to correct parent element am: ba82dd3908
Alan Viverette [Tue, 6 Jun 2017 14:34:34 +0000 (14:34 +0000)]
Move <permission> tags to correct parent element am: ba82dd3908
am: d29f35eb4c

Change-Id: Icef85c6c1bb2493420301aa33f30f27d8b99bb3a

6 years agoMove <permission> tags to correct parent element
Alan Viverette [Tue, 6 Jun 2017 14:25:46 +0000 (14:25 +0000)]
Move <permission> tags to correct parent element
am: ba82dd3908

Change-Id: I235e92d4a0dca03d86e2e18f4caeed6ce95e211c

6 years agoMove <permission> tags to correct parent element
Alan Viverette [Fri, 2 Jun 2017 14:37:32 +0000 (10:37 -0400)]
Move <permission> tags to correct parent element

AAPT2 is stricter about enforcing correctness, and the permission tags
were in the wrong place.

Fixes: 62262214
Test: builds with AAPT2
Change-Id: I20fb827f81d9b57404c6c02bdfa27acf3e572c90

6 years agoMerge "Fix makefile include for support-v4" into oc-dev am: 49496305fa
Alan Viverette [Thu, 11 May 2017 11:35:55 +0000 (11:35 +0000)]
Merge "Fix makefile include for support-v4" into oc-dev am: 49496305fa
am: eee8680939

Change-Id: I173a593c8cd71e6cfdb47c6d9aadf8d99dc6c323

6 years agoImport translations. DO NOT MERGE am: 907cd0546f -s ours
Bill Yi [Thu, 11 May 2017 11:35:36 +0000 (11:35 +0000)]
Import translations. DO NOT MERGE am: 907cd0546f  -s ours
am: bd69754242  -s ours

Change-Id: If20c21868d46d6db2385501531b2a1cb29c0a950

6 years agoMerge "Fix makefile include for support-v4" into oc-dev
Alan Viverette [Thu, 11 May 2017 05:39:02 +0000 (05:39 +0000)]
Merge "Fix makefile include for support-v4" into oc-dev
am: 49496305fa

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3

6 years agoMerge "Fix makefile include for support-v4" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 02:55:03 +0000 (02:55 +0000)]
Merge "Fix makefile include for support-v4" into oc-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 11 May 2017 01:20:35 +0000 (01:20 +0000)]
Import translations. DO NOT MERGE
am: 907cd0546f  -s ours

Change-Id: I6fd4d51f07fb762db5650f690aaa5985b1aa0f9d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 10 May 2017 19:42:36 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib4083351435abccd9a56eb63896203538fa726b4
Auto-generated-cl: translation import

6 years agoFix makefile include for support-v4
Alan Viverette [Tue, 9 May 2017 19:46:16 +0000 (15:46 -0400)]
Fix makefile include for support-v4

Test: make Gallery2
Change-Id: I361d0844f8c71ca4a258ede082d18edf06224c9a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 May 2017 16:49:05 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I210fbd127c6055d3c45e24aa03fbbb3e463f9399
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
The Android Open Source Project [Tue, 2 May 2017 10:14:59 +0000 (03:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie07649e78ca2753c896ef259a7eaf1e97a1c9c94
Auto-generated-cl: translation import

7 years agoFix proguard failure when using javac am: 084ef10d7d
Alan Viverette [Thu, 27 Apr 2017 19:35:54 +0000 (19:35 +0000)]
Fix proguard failure when using javac am: 084ef10d7d
am: f62a9d75db

Change-Id: I9cc4269d87a884d0e66adc8ec78d71f06eefa03d

7 years agoFix proguard failure when using javac
Alan Viverette [Thu, 27 Apr 2017 19:25:23 +0000 (19:25 +0000)]
Fix proguard failure when using javac
am: 084ef10d7d

Change-Id: I9da2eb3cf5f0b890992eab29f83a2368cae71190

7 years agoFix proguard failure when using javac
Alan Viverette [Thu, 27 Apr 2017 19:16:37 +0000 (15:16 -0400)]
Fix proguard failure when using javac

Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false
Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999

7 years agoUse explicit support library prebuilts am: 0673572ff9
Alan Viverette [Fri, 21 Apr 2017 17:05:34 +0000 (17:05 +0000)]
Use explicit support library prebuilts am: 0673572ff9
am: c66df7ddf9

Change-Id: I79e0d55d015d029f331e79e442f60ccfa6a04143

7 years agoUse explicit support library prebuilts
Alan Viverette [Fri, 21 Apr 2017 17:02:15 +0000 (17:02 +0000)]
Use explicit support library prebuilts
am: 0673572ff9

Change-Id: I151e95a4943294d0c1a8f2f8565f4ef79b16f610

7 years agoUse explicit support library prebuilts
Alan Viverette [Fri, 21 Apr 2017 14:47:41 +0000 (10:47 -0400)]
Use explicit support library prebuilts

Test: make Gallery2
Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I59208256a3abd71ef8b352b132a4de0d61d88c03

7 years agoFix build Gallery2 am: a611ca04d2
Seigo Nonaka [Fri, 21 Apr 2017 10:28:45 +0000 (10:28 +0000)]
Fix build Gallery2 am: a611ca04d2
am: a86c0f3f29

Change-Id: Ib297115644b34179601c24c2976f0f7ca3a51e19

7 years agoFix build Gallery2
Seigo Nonaka [Fri, 21 Apr 2017 10:22:56 +0000 (10:22 +0000)]
Fix build Gallery2
am: a611ca04d2

Change-Id: I569529ea748c770b12932ab2ec61a28c03dcbf4c

7 years agoRevert setting Werror flag - there are still warnings on some builds.
Tomasz Wasilczyk [Thu, 20 Apr 2017 16:19:01 +0000 (16:19 +0000)]
Revert setting Werror flag - there are still warnings on some builds.

Change-Id: I94a2c0f5885e19d186506062e67d538ae3c7bf09
Test: it builds.
Bug: b/37159108

7 years agoFix build Gallery2
Seigo Nonaka [Wed, 19 Apr 2017 23:34:28 +0000 (16:34 -0700)]
Fix build Gallery2

Test: N/A
Bug: N/A
Change-Id: I1822b79d421c025d3be63af040849bde7397ac25

7 years agoFix warnings and set Werror flag to not let them happen again.
Tomasz Wasilczyk [Fri, 7 Apr 2017 22:53:44 +0000 (15:53 -0700)]
Fix warnings and set Werror flag to not let them happen again.

Test: it builds.
Bug: b/37159108
Change-Id: I898f5de0f8e992404977d4958b8dd44af4aea9fe

7 years agoImport translations. DO NOT MERGE am: 5ffe930607 -s ours am: 14eaf78900 -s ours
Bill Yi [Sun, 2 Apr 2017 09:08:02 +0000 (09:08 +0000)]
Import translations. DO NOT MERGE am: 5ffe930607  -s ours am: 14eaf78900  -s ours
am: 42d6db3c59  -s ours

Change-Id: I0c1d7a0e41a7f8ad09d73a32dbfa29aee3abc6e0

7 years agoImport translations. DO NOT MERGE am: 5ffe930607 -s ours
Bill Yi [Sun, 2 Apr 2017 09:01:40 +0000 (09:01 +0000)]
Import translations. DO NOT MERGE am: 5ffe930607  -s ours
am: 14eaf78900  -s ours

Change-Id: Ic8fe7f9446e65a9e26c46e5989655985018c0bef

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 08:50:17 +0000 (08:50 +0000)]
Import translations. DO NOT MERGE
am: 5ffe930607  -s ours

Change-Id: Iaf6552a6a14beb2dc5504a7229549a8ff36a6c0a

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 06:49:14 +0000 (23:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ie89627c154c5615de8cea71fb1044237a22754ef

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 22 Feb 2017 07:16:46 +0000 (23:16 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iea7efcca8eecc21cdf8eda27a4e664365f2a1f5f
Auto-generated-cl: translation import

7 years agoMerge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9
Paul Duffin [Tue, 21 Feb 2017 18:20:09 +0000 (18:20 +0000)]
Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9
am: 508d9e47f4

Change-Id: I1fa8a30c27e462604b1625d6f78031a12117f640

7 years agoMerge "Stop using junit classes in production" am: f1ec8df547
Paul Duffin [Tue, 21 Feb 2017 18:10:01 +0000 (18:10 +0000)]
Merge "Stop using junit classes in production" am: f1ec8df547
am: d382e794e9

Change-Id: I43e1638614a6076b0a664352367adce76cf80787

7 years agoMerge "Stop using junit classes in production"
Paul Duffin [Tue, 21 Feb 2017 18:01:03 +0000 (18:01 +0000)]
Merge "Stop using junit classes in production"
am: f1ec8df547

Change-Id: If020e58b695e143378fde0bbe804678e74b2c905

7 years agoMerge "Stop using junit classes in production"
Paul Duffin [Tue, 21 Feb 2017 11:19:20 +0000 (11:19 +0000)]
Merge "Stop using junit classes in production"

7 years agoStop using junit classes in production
Paul Duffin [Mon, 20 Feb 2017 13:42:18 +0000 (13:42 +0000)]
Stop using junit classes in production

Bug: 35234437
Bug: 30188076
Test: make checkbuild
Change-Id: Ib24448a030f05bb43a62eecec91ba08249672426

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Feb 2017 22:19:18 +0000 (14:19 -0800)]
Import translations. DO NOT MERGE

Change-Id: I50a25080b5a81c359a88c244ca4050f4931a3a4a
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Feb 2017 15:30:40 +0000 (07:30 -0800)]
Import translations. DO NOT MERGE

Change-Id: If4a3fd1789ecc43a7a18abd257c319fe43f178e1
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE am: bdba1ead72 -s ours
Bill Yi [Fri, 3 Feb 2017 08:49:24 +0000 (08:49 +0000)]
Import translations. DO NOT MERGE am: bdba1ead72  -s ours
am: bd7fc276ef  -s ours

Change-Id: I50af680107264190f6ee3a183879fae0ac09ed2a

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 08:36:24 +0000 (08:36 +0000)]
Import translations. DO NOT MERGE
am: bdba1ead72  -s ours

Change-Id: Ia88697d0b148afd53ddc5ed30d37e4443f92ac1c

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 2 Feb 2017 22:15:56 +0000 (14:15 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic65aef98626ccccf928779d23df022434aa60436
Auto-generated-cl: translation import

7 years agoRename language+country resources to just language
Roozbeh Pournader [Wed, 11 Jan 2017 05:27:38 +0000 (21:27 -0800)]
Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I258030ee680426b667e52cbb1e8b7026cbe4566b