summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
55a363ff86 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13563636 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If2806342a46488c07a6e9906cba4a4cdf8ae0e46
2021-02-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic99f68d6b53592c9ed6cc456435d8342231b82a3
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Car/SystemUpdaterBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I01330c9e541f4b852f9745df3313b407f29d679c
2021-01-16[automerger skipped] Merge "Allow injected settings icon to be tinted" into ↵TreeHugger Robot
qt-car-dev am: 6ead6ffdab am: a707df7325 am: e4ed8759fe -s ours am skip reason: Change-Id Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5 with SHA-1 5b1f072c38 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13357538 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie7c452d107e7d03ed4821a4940be52cf56d81be4
2021-01-16Merge "Allow injected settings icon to be tinted" into qt-car-dev am: ↵TreeHugger Robot
6ead6ffdab am: a707df7325 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13357538 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If7c4d3e41c57194cf5ff07eb9a8e299e2adc6a97
2021-01-16Merge "Allow injected settings icon to be tinted" into qt-car-dev am: 6ead6ffdabTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13357538 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib173af102826f1e396cae5b804e31a85a6cf0106
2021-01-15Merge "Allow injected settings icon to be tinted" into qt-car-devTreeHugger Robot
2021-01-15Allow injected settings icon to be tintedAlex Stetson
To allow for the injected icon to be easily visible inside of CarSettings, it should be tintable. Bug: 174118110 Bug: 177508455 Test: manual Change-Id: Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5 Merged-In: Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5
2020-12-10Allow injected settings icon to be tintedAlex Stetson
To allow for the injected icon to be easily visible inside of CarSettings, it should be tintable. Bug: 174118110 Test: manual Change-Id: Iff8aa3804b6c94163a8f9a23d0fddc874cf991f5
2020-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
84ec51dee8 -s ours am: 6723f216e0 -s ours am: 6b3fc3939b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1519188 Change-Id: Ie3a43285ef76eee4fcb3a00b6d70cdaa197e53c4
2020-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
84ec51dee8 -s ours am: 6723f216e0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1519188 Change-Id: I0e0638bed7782fc2326c8db36340fcb72c2ef425
2020-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android-s-preview-1Bill Yi
84ec51dee8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1519188 Change-Id: If935b66beed287d8b6a07fe7f31afac0fb927926
2020-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ied4a8c544b967556f98caa467478d7f08d9c6acd
2020-12-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3682ce2bf0 -s ours am: ce0c76fad1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13165378 Change-Id: I4f0d8c0768bb0bc9838b58497e1f60670adbad35
2020-12-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3682ce2bf0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13165378 Change-Id: I025178194e9a4fc3a934f02507dd8e5b56a4f491
2020-12-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id7f9a4d2e88f12e9fe9e07f31fe5704b258c7b8f
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
a252477bfa -s ours am: f7adf97979 -s ours am skip reason: Change-Id I80d25d3862efb1b3a0f513e1d4ea70c487af2c29 with SHA-1 033cb74778 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13120509 Change-Id: Ic62b1d7dfd0aa979f206bd63a8f37801fc56d195
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
a252477bfa -s ours am skip reason: Change-Id I80d25d3862efb1b3a0f513e1d4ea70c487af2c29 with SHA-1 033cb74778 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13120509 Change-Id: I1310251270a651c21b4eb2f2c10902607cfeff1f
2020-11-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2e27de145e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13137686 Change-Id: I85538e7d366b8f71d0551ce8580e00ac2874bab2
2020-11-27Import translations. DO NOT MERGE ANYWHEREandroid-mainline-11.0.0_r44android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseBill Yi
Auto-generated-cl: translation import Change-Id: I037cb8e49aef79c73ded5976bfb5167d85d2c911
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 7d43e8a654 -s ours am: eb14fd37d7 -s ours am: b03ecf2af5 -s ours am: 2037bc0c2b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I67bb37dc5e7c64ec94263444d750bd7417c8c26a
2020-11-26[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
qt-car-dev am: 2ba3bf2338 -s ours am: 866d412fdc -s ours am: c9902d26a7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132610 Change-Id: I7f1fce68a67d4529368df604bdf1bd5a7a397af6
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 241043221e -s ours am: b996b6fe32 -s ours am: 5349668f0f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I0ff4ad7291e1e2ddb6944d8d54ece22fc14ea33d
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 7d43e8a654 -s ours am: eb14fd37d7 -s ours am: b03ecf2af5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I9d91f6f99daa5e7a8d6b480dd7722355af698e48
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 7d43e8a654 -s ours am: eb14fd37d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I667dbb02f3684bc5759977860d07f3db986ac7f9
2020-11-26[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
qt-car-dev am: 2ba3bf2338 -s ours am: 866d412fdc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132610 Change-Id: Ic75702e1b6a0553a28e98257ba8a29c7bb069f51
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 241043221e -s ours am: b996b6fe32 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Iad06158429ea3583aa5657fbc3568988a17dbd39
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 7d43e8a654 -s ours am: 862c645cd8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I6ebbdd3eb46181d9eb1966a1f5724dfdfa6ea874
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 7d43e8a654 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ic6259056957b1a66fba7b4d232dc570a29f7ab9e
2020-11-26[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
qt-car-dev am: 2ba3bf2338 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132610 Change-Id: Ic22b439bc4e5de204059f6068a571be925e38f34
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 7d43e8a654 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I01a32ffe23036cc41e72c90039e76db85b90b215
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am: 241043221e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I2c0f1913b9fca632b927ed163fe315b73bb50a70
2020-11-26Merge "Import translations. DO NOT MERGE ANYWHERE" into qt-car-devTreeHugger Robot
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: I1837076d506586e00cafda86b4d1854ed122fbd9
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am: 5523df0427 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ib7f6bc25aba01a9ebd87ee2a8664d60963290d11
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am: bf76639a00 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ic3eb5c05e53fe118b4c3dfcd869b11763efeec0c
2020-11-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
864999a5d5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13132609 Change-Id: Ia8fe642ec6e5112ee58fedbc2482bcb41b898d39
2020-11-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I002fa3f88de8d70a82c973d4b15d4df21761cab8
2020-11-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9dec1329e963be52f55a44fb733d628a518a5601
2020-11-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0faccc2b0c -s ours am: 9329a0293d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13113525 Change-Id: I33dc8884ab92ca0875a40f87452ddd4c4391ee4b
2020-11-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0faccc2b0c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/13113525 Change-Id: Iea4ba5fd5a04f9ca46f699bd81a916c6db2ac37d
2020-11-23Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ice77bb78ad2552ff03b77de4810c4011d60362f9
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li
Bug: 172690556 Merged-In: I80d25d3862efb1b3a0f513e1d4ea70c487af2c29 Change-Id: If99b96cc09d8b4c3656cbfad808bd59fc480157b
2020-11-20Revert "Import translations. DO NOT MERGE ANYWHERE"Bill Yi
This reverts commit 6feff761c16a9b6442696691a30d27a30efe60c6. Reason for revert: Incorrect import Change-Id: I181857509ed155ec7426910f550cea94630a8637
2020-11-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5c03c7694d73b3a7bf67f435f76788dc4c4113f8
2020-11-09Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Ica62b735ab3ad9687129d1ea92f3cdf1bf98166a
2020-11-07Merge sc-d1-dev 6958804 into master.Bill Rassieur
Change-Id: I476a4c9000d33fea1a25c6953c9a0b08ce8394df BUG:171916167
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7e1659f1f4 -s ours am: ↵Xin Li
345c521078 -s ours am: 8cc1ea5686 -s ours am: 0f36dd894c -s ours am skip reason: Change-Id I344aa092050cfa3ee3c2a411113655c8f5119a45 with SHA-1 6fd4288c51 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12797354 Change-Id: I294337a96e6b2899d2f8437aa53bbaedb6f65308
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7e1659f1f4 -s ours am: ↵Xin Li
345c521078 -s ours am: 8cc1ea5686 -s ours am skip reason: Change-Id I344aa092050cfa3ee3c2a411113655c8f5119a45 with SHA-1 6fd4288c51 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12797354 Change-Id: I510e4713cebefbda28116909276e83695626a804
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7e1659f1f4 -s ours am: ↵Xin Li
345c521078 -s ours am skip reason: Change-Id I344aa092050cfa3ee3c2a411113655c8f5119a45 with SHA-1 6fd4288c51 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/12797354 Change-Id: I3fad220aa64f5abc329eaac403b276f5ab775ede