Commit Graph

81640 Commits

Author SHA1 Message Date
TreeHugger Robot
eeb6301479 Merge "Update storage usage progress bar summary text" into sc-dev am: 8b58ae9d4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230402

Change-Id: I4e28ec560435932c4eaeb2e76eee6d56e95d093a
2021-04-19 07:56:26 +00:00
TreeHugger Robot
8b58ae9d4f Merge "Update storage usage progress bar summary text" into sc-dev 2021-04-19 07:41:24 +00:00
YUKAI HUNG
2c7e6c57bd Merge "Add app usage preferencee item into the history preference" into sc-dev am: 36e9a5ffd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230387

Change-Id: I02b9113d4352140a9171640835fc6ad1d6096d6c
2021-04-19 07:20:11 +00:00
YUKAI HUNG
36e9a5ffd2 Merge "Add app usage preferencee item into the history preference" into sc-dev 2021-04-19 06:52:40 +00:00
Jeremy Goldman
7e4418aae4 Merge "Check if the SubscriptionsChangeListener has been started before stop" into sc-dev am: aeaad6bd2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187776

Change-Id: I34801ac5ae9774e47b529054d6e16167051c67ce
2021-04-19 06:43:11 +00:00
Jeremy Goldman
aeaad6bd2e Merge "Check if the SubscriptionsChangeListener has been started before stop" into sc-dev 2021-04-19 06:21:59 +00:00
Jeremy Goldman
734f79ae4d Merge "If the proider model is enabled, the User cannot create insecure VPNs" into sc-dev am: 770ad5cbd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185086

Change-Id: Ib29147f7171f108b21f93b4e15e72e841b557e3f
2021-04-19 04:55:55 +00:00
ykhung
bcf0a411a1 Add app usage preferencee item into the history preference
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I7d9a14eca0b8d3b054e040cb13135ef15390e512
2021-04-19 04:45:11 +00:00
Jeremy Goldman
770ad5cbd7 Merge "If the proider model is enabled, the User cannot create insecure VPNs" into sc-dev 2021-04-19 04:38:51 +00:00
Arc Wang
2e04e81da8 Update storage usage progress bar summary text
Shows a simplified version, e.g., 24GB used / 64 GB total

Bug: 174964885
Test: manual visual
Change-Id: Ia7a12d0cf7444ebb172ef2c23209196e01eadac0
2021-04-19 12:08:16 +08:00
Arc Wang
f240e1fb0e Merge "Update storage usage progress bar summary text" into sc-dev am: 1073196af9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209650

Change-Id: Ib3f2b5a1a067d7584bfda5bb3297f5d6993e9847
2021-04-19 02:33:19 +00:00
Arc Wang
1073196af9 Merge "Update storage usage progress bar summary text" into sc-dev 2021-04-19 02:13: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
Arc Wang
7a43ffde90 Update storage usage progress bar summary text
Shows a simplified version, e.g., 24GB / 32% used of 64 GB

Bug: 174964885
Test: manual visual
Change-Id: I39cdc5efa1d562c339525fa23456c71b726b9e1a
2021-04-16 21:46:19 +08: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
Jeremy Goldman
abc82d2606 If the proider model is enabled, the User cannot create insecure VPNs
Additionally, existing secure vpns cannot have their type changed to an
insecure type.
Existing insecure VPNs can be edited, but once the type is changed to a
secure type, it cannot be set to an insecure type again.

Note that devices without FEATURE_IPSEC_TUNNELS still have the ability
to make insecure VPNs at the moment. What to do about these devices will
be addressed in a future change.

Recall video with this Change: https://recall.googleplex.com/projects/a801b0cf-91a5-414e-973b-3c1c8fb5e7be/sessions/bc54e4f2-0205-4822-a51a-382e54f3a956

Test: atest -c SettingsUnitTests
Bug: 176821216
Change-Id: Icf87419650c934a783b01f4d2907b7f704d139b8
2021-04-16 13:11:31 +08:00