Commit Graph

81626 Commits

Author SHA1 Message Date
Bill Yi
403e4244c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3ec46a3938ac5230e56e2a75ffe53500db2e3e39
2021-04-19 21:03:08 +00:00
ykhung
b3c7bb02c4 Merge original AOSP chart into battery usage with runtime switchable am: 33115020ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215688

Change-Id: I2f8b577b5ace58923ae1acbb697cb1b51b0c874c
2021-04-18 16:22:04 +00:00
ykhung
33115020ba Merge original AOSP chart into battery usage with runtime switchable
This patch is merged from ag/14111128 and seperate two different chart
design between isChratGraphEnabled() method, but we drop the options
menu in the both versions to align the new material next design.

Bug: 185187718
Bug: 185187591
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie88df6a94abf5d1652440fe35392b9f47c447537
2021-04-18 15:59:43 +00:00
TreeHugger Robot
f7c618d07e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8897a11364 -s ours am: 434ce05cec -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14226977

Change-Id: Ib09647da177dad608e303119f3755f500f8d47f3
2021-04-18 08:11:00 +00:00
Bill Yi
20009240f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8ebe526 -s ours am: 7ff7c19246 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14226978

Change-Id: I0c9d1c9acc18e37e8caec30985ef342bc20684fe
2021-04-18 08:09:52 +00:00
TreeHugger Robot
434ce05cec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8897a11364 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14226977

Change-Id: I52b038ea30198769b82df04ae51aded1ae6ed517
2021-04-18 07:48:38 +00:00
Bill Yi
7ff7c19246 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8ebe526 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14226978

Change-Id: Ib3c3796c150c77d62454af214e1fd045050a7aa3
2021-04-18 07:48:06 +00:00
TreeHugger Robot
b8c070dcf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2bb7ce44a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14227516

Change-Id: I1649bcd281414f08ea5a4d571d8a70d962756b81
2021-04-18 07:33:41 +00:00
TreeHugger Robot
2bb7ce44a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-18 07:08:12 +00:00
TreeHugger Robot
8897a11364 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-18 07:04:08 +00:00
TreeHugger Robot
dccd23d322 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-18 06:40:03 +00:00
TreeHugger Robot
1dd2f73193 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-18 05:59:03 +00:00
Bill Yi
44ba9d6bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5fbdf88b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14227515

Change-Id: I7dafad5cc4682698ce8b591bca4a86944c605eab
2021-04-18 05:26:42 +00:00
Bill Yi
80d8ebe526 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia65a97a90af59964e451be02327a618179b38af0
2021-04-17 21:48:45 -07:00
Bill Yi
c784589af7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4a5f8ef8d69bf4bcb11c690de734387a3244b438
2021-04-17 21:45:23 -07:00
Bill Yi
a921c816e4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id31d24e76bc910c50208ea822e37a62d18506fff
2021-04-17 21:13:35 -07:00
Bill Yi
f5fbdf88b7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id5d4c07b2fdf6ea906b5aa656be048d883e8f774
2021-04-17 21:10:24 -07:00
Bill Yi
4f23d17e72 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5639e020f1021904114ec134ccf7527aff92bd63
2021-04-18 03:59:07 +00:00
Bill Yi
029acb868c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24c9bb011ae4615b987f8a095c1ff615c7d8fb84
2021-04-18 03:55:46 +00:00
ykhung
6fe3ad2787 Support badged icon for work profile mode and add system checking am: 5aa3c23535
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215687

Change-Id: I279ad55d915c81970e77a04071fe751b153fb502
2021-04-17 17:27:29 +00:00
ykhung
5aa3c23535 Support badged icon for work profile mode and add system checking
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iebe458b364ab02eaf595bfc3b1a455e5be7d3d9d
2021-04-17 13:29:07 +00:00
ykhung
c0f9c69402 Purge low percentage BatteryDiffEntry from indexed usage map am: 3cdf60c016
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209652

Change-Id: Ib669083c6959f19e7fbfaca93e729af616cced9f
2021-04-17 11:56:23 +00:00
ykhung
3cdf60c016 Purge low percentage BatteryDiffEntry from indexed usage map
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I943e224147ccbfa80578511d6cb0d6adf6f8da0f
2021-04-17 10:22:11 +00:00
TreeHugger Robot
685e27fb69 Merge "Fix color checking error of the repohooks" into sc-dev am: 976c6ac56d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209645

Change-Id: Id6928690541cc609e527389954e9e0d7bc3d42f4
2021-04-16 09:14:28 +00:00
Syaoran Kuo
92a923c9bf Merge "Adds new test for notification." into sc-dev am: f608d1e7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124306

Change-Id: I73c81ffbf50ae22b8cbbb189c46634c8b1fe517c
2021-04-16 09:14:08 +00:00
YUKAI HUNG
b98ea3430d Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev am: edfa085b2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199745

Change-Id: Ie7a2005de7660e962f474eb26d0a824ec8fcd3c8
2021-04-16 09:13:26 +00:00
TreeHugger Robot
976c6ac56d Merge "Fix color checking error of the repohooks" into sc-dev 2021-04-16 09:00:15 +00:00
Syaoran Kuo
f608d1e7b6 Merge "Adds new test for notification." into sc-dev 2021-04-16 08:58:01 +00:00
YUKAI HUNG
edfa085b2f Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev 2021-04-16 08:54:59 +00:00
TreeHugger Robot
25d5b029f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 20e30c3033 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14206659

Change-Id: I363cfc5cf0a443fb38455161d0323c80d1495043
2021-04-16 07:51:12 +00:00
TreeHugger Robot
20e30c3033 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 07:25:13 +00:00
TreeHugger Robot
5fc668b3f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d2e2ea27fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14206657

Change-Id: I4c3e2ab6a257074eb648f3b7e40fa12677f78485
2021-04-16 07:17:43 +00:00
TreeHugger Robot
d2e2ea27fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 07:07:41 +00:00
TreeHugger Robot
7fcfd25219 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev am: ab12e78a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199750

Change-Id: I43ba102697afd7d07d89bac27b49863f47c2e235
2021-04-16 07:06:26 +00:00
Sunny Shao
dd64c59fe5 Fix color checking error of the repohooks
Fixes: 185547877
Test: repo upload
Change-Id: I1a28795a659768d0b4fb046cfdd7877701919c26
2021-04-16 15:05:53 +08:00
ykhung
ab5e180139 Refine logic and add simple test for BatteryChartPreferenceController
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie218cf967c6f30c6eadcdfe6bfd3f37ccdc2276e
2021-04-16 07:02:04 +00:00
TreeHugger Robot
ab12e78a10 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev 2021-04-16 06:50:01 +00:00
Ryan Lin
272ebbb9fe Merge "Extract the logic of MagnificationMode to the controller" into sc-dev am: 3a34a5767b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065249

Change-Id: Ia6ee7f90e2aa4f7751fd7c3e26384b0485699396
2021-04-16 03:54:47 +00:00
TreeHugger Robot
a8b81fabbc Merge "Fix Wi-Fi tips disappeared issue in airplane mode" into sc-dev am: 3b179a8930
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173740

Change-Id: I965ea58e7adaa4834b19f910ee4a4aeafe68af7a
2021-04-16 03:54:40 +00:00
Ryan Lin
3a34a5767b Merge "Extract the logic of MagnificationMode to the controller" into sc-dev 2021-04-16 03:50:27 +00:00
Bill Yi
bb3b7093b3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6dd73a11f0253736e39bb029921b652446561ec1
2021-04-16 03:37:48 +00:00
TreeHugger Robot
3b179a8930 Merge "Fix Wi-Fi tips disappeared issue in airplane mode" into sc-dev 2021-04-16 03:32:02 +00:00
Bill Yi
87d6375249 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I482aa1945a56fb9c6402661cf3268d6207d984ec
2021-04-16 03:04:45 +00:00
Curtis Belmonte
f6da4da32c Merge "Add a config for the face enroll introduction activity" into sc-dev am: 025bb7cab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14191889

Change-Id: I2b2d4259adc013cd004c4b8f392e72ef973cdd34
2021-04-16 00:39:39 +00:00
Curtis Belmonte
025bb7cab5 Merge "Add a config for the face enroll introduction activity" into sc-dev 2021-04-16 00:13:13 +00:00
Biswarup Pal
48bb439db6 Fix TranscodeDisableCachePreferenceControllerTest
Test: TranscodeDisableCachePreferenceControllerTest
Bug: 185483742
Change-Id: Ie448929fb50a49a0641baf6456df11430bb9f1c6
2021-04-15 20:08:48 +00:00
TreeHugger Robot
55d1dc2d9a Merge "Rename privacy dashboard top-level item" into sc-dev am: 6840ead634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187492

Change-Id: Idca700243143efbdb98f3b227aa1a107d08affde
2021-04-15 17:53:30 +00:00
TreeHugger Robot
6840ead634 Merge "Rename privacy dashboard top-level item" into sc-dev 2021-04-15 17:08:59 +00:00
Biswarup Pal
940cb585fa Merge "Implement controller to disable transcoding cache" into sc-dev am: acb5bebb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186626

Change-Id: If620a754483bc848c5b5eb5ec68e80cafc00854a
2021-04-15 11:37:22 +00:00
Biswarup Pal
acb5bebb3d Merge "Implement controller to disable transcoding cache" into sc-dev 2021-04-15 11:24:27 +00:00