ykhung
60c731f31e
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: Id0c518bf69ae4d29bef064e4ecb283a1b54f25f6
2021-04-18 16:22:36 +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
a6a8d24dba
[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: I36463dd54ab2aff33e05844ab8cff1c414cec824
2021-04-18 08:10:41 +00:00
Bill Yi
456335ba3e
[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: Ie7bf0379ae005af79fc61c69aa2adb18c6b6b387
2021-04-18 08:09:59 +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
99df2fd925
[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: I57ccc95b6513a62cb8813556554b66c3568810af
2021-04-18 07:33:53 +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
Bill Yi
d22c1dcad2
[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: I57a7d462f468582d08cc78f51675fb215b8dfaad
2021-04-18 05:27:12 +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
ykhung
096c46fb52
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: I4283426feacc0f2a59ecc4e907627bcaf6bacb93
2021-04-17 17:16:48 +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
7c7b54216b
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: I98e2d5cf41442d26433b82a4aa808396479c0339
2021-04-17 11:56:32 +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
3a8d565425
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: Id71dadb097ca601d42c99774e9de781f01fedaa1
2021-04-16 09:14:46 +00:00
Syaoran Kuo
78cc7aadd9
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: I5c8d222272b28a5ce45ffd5faa07d1c819567f51
2021-04-16 09:14:25 +00:00
YUKAI HUNG
ec76f8df04
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: I6086af90e7d2c2a4dfc78c101656b1d2c788cb52
2021-04-16 09:14:00 +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
1bfe96fbd3
[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: I6d341fb1fef49ca139fb06a14f7b9f78d0bf5bf1
2021-04-16 07:51:35 +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
e4c1b8d7ee
[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: I59f22889beeb616d03d80acba4669a4d383fc2c4
2021-04-16 07:18:24 +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
0dab718421
Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev am: ab12e78a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199750
Change-Id: I6cc1e402cfc1714eb7e1c9f8800689f333959d7a
2021-04-16 07:06:40 +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
c3805d947e
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: Icc29afab0666ea6f9613b9d657e7aca3b4df8bc0
2021-04-16 03:55:16 +00:00
TreeHugger Robot
6ebdd8ae2f
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: I2540637df9ed2d0592851bc81c6523dd744f8f6b
2021-04-16 03:54:48 +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
e455c07c99
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: Ie50b399fa0edc5534356769be909718c2537406f
2021-04-16 00:40:11 +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
a1c56bae70
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: I96701612281a27dfc3652b45c3e0a98c113a312a
2021-04-15 17:54:23 +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
31817fefca
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: Iad815b2ab401854072074d062ed88f673c3213c6
2021-04-15 11:37:43 +00:00
Biswarup Pal
acb5bebb3d
Merge "Implement controller to disable transcoding cache" into sc-dev
2021-04-15 11:24:27 +00:00
ryanlwlin
8e5e4dec12
Extract the logic of MagnificationMode to the controller
...
To move the preference to the upper layer, we extract all logics
to its controller.
We move all tests to the test files and add server tests to
verify the behaviour of edit shortcut dialog.
Bug: 182992338
Test: atest MagnificationModePreferenceControllerTest
Change-Id: I34c4361e2e116a22c3e34bd35c8ac8cac752ab96
2021-04-15 18:41:44 +08:00
TreeHugger Robot
b98aded545
Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev am: 089c56520d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167803
Change-Id: I35e9173bad46236a273f891849b9c8a2643fe8e5
2021-04-15 10:01:59 +00:00
Marie Matheson
a8e83d3d39
Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev am: bcf3fc6272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186646
Change-Id: I2986ade9c4b3352ad761ef73e8e092e63d12d0b9
2021-04-15 10:01:48 +00:00
YUKAI HUNG
d969786f3d
Merge "Add cache mechanism to improve icon and label loading performance" into sc-dev am: 98ad383e5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187767
Change-Id: I1b1cba1674371315dac5d50453b3c21775d577ac
2021-04-15 10:01:17 +00:00
TreeHugger Robot
089c56520d
Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev
2021-04-15 08:49:36 +00:00