Commit Graph

84150 Commits

Author SHA1 Message Date
TreeHugger Robot
40ce285218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8897a11364 -s ours am: 434ce05cec -s ours am: faa781f1de -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: Ia3dc2427ee2c64ba9676d8fd2b1b3241a2b926cc
2021-05-16 11:37:01 +00:00
Bill Yi
5a23619e78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8ebe526 -s ours am: 7ff7c19246 -s ours am: efdfb9a6ca -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: I22ac7b002d28e98a40b0935013cfc9e78046b962
2021-05-16 11:36:56 +00:00
TreeHugger Robot
5d3d96bdd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2bb7ce44a3 -s ours am: 6ea54ebff3 -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: Ic9191b328b3031087ce7da15fc8e74ee48f5a2d7
2021-05-16 11:36:33 +00:00
Bill Yi
586381ca97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5fbdf88b7 -s ours am: 35aef5e547 -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: Ibd34c5efe68c78e869fbd1984816ec4e362f0c01
2021-05-16 11:36:28 +00:00
ykhung
32bbcff29c Support badged icon for work profile mode and add system checking am: 5aa3c23535 am: fc6514a90d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215687

Change-Id: I7744c9934d3f69acee5955fedadaaf93892e884f
2021-05-16 11:36:23 +00:00
ykhung
466376b44b Purge low percentage BatteryDiffEntry from indexed usage map am: 3cdf60c016 am: 53c793ca19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209652

Change-Id: Id07ad680d35adb1a8ac2b17e571aeb360f8d7b2d
2021-05-16 11:36:17 +00:00
TreeHugger Robot
c7c7bf2235 Merge "Fix color checking error of the repohooks" into sc-dev am: 976c6ac56d am: 9eda16552d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209645

Change-Id: If98269132fabc0ab4abfb13efb223901ff2a6123
2021-05-16 11:36:12 +00:00
Syaoran Kuo
45e31a41e2 Merge "Adds new test for notification." into sc-dev am: f608d1e7b6 am: 16b65a1800
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124306

Change-Id: Ifa03683f1b2f9d401e2e01d4b67121af2889103e
2021-05-16 11:36:07 +00:00
YUKAI HUNG
cf293d1542 Merge "Refine logic and add simple test for BatteryChartPreferenceController" into sc-dev am: edfa085b2f am: f4a069053b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199745

Change-Id: Ic48ac783592a46688700ad860f4aa51008c64801
2021-05-16 11:36:01 +00:00
TreeHugger Robot
32fe15b7ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 20e30c3033 -s ours am: b8cb2b291d -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: Ic85c6569f3f3f85e02b521bfdb05b0ae71e71f09
2021-05-16 11:35:27 +00:00
TreeHugger Robot
328e045be6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d2e2ea27fb -s ours am: 9c336b143f -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: I23d6fcf0c9d7b8e2094af6500f5d7710bdffd74f
2021-05-16 08:37:24 +00:00
TreeHugger Robot
eec23a26e2 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev am: ab12e78a10 am: a3011a7297
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199750

Change-Id: If81b89c5548642e84bfa51ed2be01bcc92d3bf23
2021-05-16 08:37:18 +00:00
Ryan Lin
951ff10003 Merge "Extract the logic of MagnificationMode to the controller" into sc-dev am: 3a34a5767b am: dff41d420f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065249

Change-Id: I27eafd658d95da74a722ea306e5fa5dedeefd604
2021-05-16 08:37:13 +00:00
TreeHugger Robot
2ec24fe500 Merge "Fix Wi-Fi tips disappeared issue in airplane mode" into sc-dev am: 3b179a8930 am: 966a184684
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173740

Change-Id: I666cd57c55ffd2b66f6dea15e35474ff2da560fa
2021-05-16 08:37:07 +00:00
Curtis Belmonte
35fd00e4e0 Merge "Add a config for the face enroll introduction activity" into sc-dev am: 025bb7cab5 am: 9c73dbf06d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14191889

Change-Id: I3bb907ba2cb89f4937fb9fa20700689a2a8905d8
2021-05-16 08:37:00 +00:00
TreeHugger Robot
7e2c423ef0 Merge "Rename privacy dashboard top-level item" into sc-dev am: 6840ead634 am: bb213a0943
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187492

Change-Id: Ib02dd32faa4d8071fbd5f1f134e5e3420c9c9dba
2021-05-16 08:36:55 +00:00
Biswarup Pal
d5eeb489a0 Merge "Implement controller to disable transcoding cache" into sc-dev am: acb5bebb3d am: 63ce92496b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186626

Change-Id: I84ab10789d0db28c16ba13ec66083a7a0f5823a7
2021-05-16 08:36:49 +00:00
TreeHugger Robot
91c662f513 Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev am: 089c56520d am: 98e34c4e5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167803

Change-Id: I030c043fb16451e4872f7ea7c159c0dcb325ee8f
2021-05-16 08:36:43 +00:00
Marie Matheson
7ce28fa523 Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev am: bcf3fc6272 am: 82e6fa00a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186646

Change-Id: I22898cdd56315e9e54e1ab39a892c857c069ae51
2021-05-16 08:36:38 +00:00
YUKAI HUNG
2e3fea2da8 Merge "Add cache mechanism to improve icon and label loading performance" into sc-dev am: 98ad383e5b am: 25371c238c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187767

Change-Id: I80e5d722d6f3e4b8d27aa14948416846fd430a93
2021-05-16 08:36:32 +00:00
Edgar Wang
62bab4e8b9 Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev am: 9d14071637 am: 23fcf20a12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182152

Change-Id: I7287ecbbc71a7b497ee0b91ffc0bff837b511e37
2021-05-16 08:36:26 +00:00
TreeHugger Robot
cbaf1c2c47 Merge "Cleanup Storage Settings" into sc-dev am: fce594ad7f am: 5695ab418c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182146

Change-Id: I102652af7811798894d7e89e41fef83115f560a9
2021-05-16 08:36:20 +00:00
Jason Hsu
6d4a999fe7 Merge "Add icon for "Extra dim"" into sc-dev am: 3909ddb789 am: 8eb4a3d3da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187045

Change-Id: I724bac788ded6c2891bb7592db6788bb30a38f5c
2021-05-16 08:36:14 +00:00
Peter Wang
263677aa8e Merge "Change DSDS dialog confirm text from "Continue" to "Yes"" into sc-dev am: 1812aabcec am: 90f24a470d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187494

Change-Id: I5b7b85a885a1c8237808c5227bba6ed9ecf68207
2021-05-16 08:36:09 +00:00
YUKAI HUNG
d200b49007 Merge "Load application icon and label for UID battery consumer type" into sc-dev am: a73e40cb74 am: c4f0c1285d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185087

Change-Id: Ia6f0b6b3e327aad010bfb8e49ef2dc85215908dc
2021-05-16 08:36:03 +00:00
Julia Reynolds
7bdcfb7157 Only one action bar needed am: 98b8716e0a am: dc1dd5dc48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14189470

Change-Id: I19076d288ffe90c1d3fba03a92673a79c35e1443
2021-05-16 08:35:58 +00:00
Julia Reynolds
98c4f56815 Merge "Restyle notif history to beter match shade" into sc-dev am: a12666a3ad am: 5d99e1c19a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14188053

Change-Id: Ib5226d3a5e9726d93a7c1aa8fcb460d76eaa30a7
2021-05-16 08:35:53 +00:00
TreeHugger Robot
5451cf2c96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ba20b96bb -s ours am: 748e873747 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I24b51271c5d16fd8209154f30cbede2b616158f8
2021-05-16 08:35:34 +00:00
TreeHugger Robot
ed3f250cc5 Merge "Toggle Power + Volume chord with long press power to assist setting" into sc-dev am: d41c4d3c8c am: fa6b2b18a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172389

Change-Id: I4a1ed56f97af16086ea87043b7b7603b3f2251c5
2021-05-16 08:35:29 +00:00
Kevin Chyn
e1b99d0b36 Merge "Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"" into sc-dev am: a328111013 am: e791667b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172320

Change-Id: I6429eb962a136bf3707e59e16f39cca05765b049
2021-05-16 08:35:23 +00:00
Dmitri Plotnikov
7c55f2fcef Merge "Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev am: 3ac49f0a9b am: aea5d6a2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078240

Change-Id: I96e36058213c92d176f289e50c422ae25b9a0f1c
2021-05-16 08:35:17 +00:00
TreeHugger Robot
10b1e121da Merge "Replace the hidden API to public API or other alternatives" into sc-dev am: 5467d0f7aa am: 26bbbed015
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173731

Change-Id: I4305d88bfe83eed99103c16771da125cc2f71ae5
2021-05-16 08:35:11 +00:00
TreeHugger Robot
f0791b2196 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 42f8180428 -s ours am: 36055c1597 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93fa9bf4805ab2f3af645de742f81d802ab172d4
2021-05-16 08:35:05 +00:00
Sally Yuen
55ed479c03 Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev am: 182c812b1b am: aeaa13af9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172316

Change-Id: I36b47de615109233d1d0ab3393f15ac64514b2da
2021-05-16 08:35:00 +00:00
YUKAI HUNG
b7af91038e Merge "Avoid load icon and label in the background for periodic job" into sc-dev am: ec91ea48a3 am: f96d931b7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182162

Change-Id: Ie4e18682a6537a19dd53a870b410ac316179ff12
2021-05-16 08:34:53 +00:00
Lucas Lin
0fbdc29d28 Merge "Remove the usage of hidden API and fix the test" into sc-dev am: e231dc2b6f am: 00332cab6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185085

Change-Id: I9159d75558dd6954364f631807474602d11153d6
2021-05-16 08:34:48 +00:00
TreeHugger Robot
df9a707f45 Merge "Prevent failed dynamic index" into sc-dev am: 0c2eb1b553 am: 9d8e5a616c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185090

Change-Id: I767fe09230674eae727774de2557b96fa3d643d0
2021-05-16 08:34:42 +00:00
TreeHugger Robot
7dfa8bc454 Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev am: ede5041dd6 am: 072ec47b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167793

Change-Id: Ifa21ea668be2a79f2eddebfee3eafc16d37a3367
2021-05-16 08:34:36 +00:00
Yanting Yang
4abe3f6179 Merge "Use sentence case for display section subheaders" into sc-dev am: 2cfa6e5f39 am: f43c018442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182156

Change-Id: Ie830d27dd4f0702d2c17bd3826209c564086ecdf
2021-05-16 08:34:30 +00:00
Tiffany Nguyen
62fa0be634 Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev am: f9acbaf425 am: 54f957aad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185089

Change-Id: Ia7a8d814db5cd9c302c702d4fee26470671ec7d0
2021-05-16 08:34:24 +00:00
Tiffany Nguyen
0f3dfdca76 Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: ceb78586ee am: 828ca94277
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172319

Change-Id: Ib20b7f04036e3e4e8d801436d91e482c2714df67
2021-05-16 08:34:18 +00:00
Jeremy Goldman
624c0de771 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev am: 21eaa6d568 am: 5ad687f487
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182147

Change-Id: I2a3a0fd4eec9b79948a868b699008c0b2ccac3c5
2021-05-16 08:34:13 +00:00
Jack He
a543088d15 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f am: ab38192a1f am: 2e22dcc7f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: I4d1f3bffcf2168fe4d678e4cfe3e9400a9eecb7b
2021-05-16 08:34:07 +00:00
Ryan Lin
5d4c64f3a8 Merge "Show the illustration with the given button mode" into sc-dev am: 0e35a6fe07 am: a339d2796f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167785

Change-Id: I2f0b33c3a17425ec0be0bda4b5ccf34ec2e92bcc
2021-05-16 08:34:00 +00:00
TreeHugger Robot
869033b673 Merge "Add 50% opacity if detect there is no device image yet" into sc-dev am: c9cbe8a572 am: 606862ec21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140159

Change-Id: Id4470640db49ba79c3922d757a34eb53274b081c
2021-05-16 08:33:55 +00:00
YUKAI HUNG
bd85508ba4 Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev am: 9c68e56389 am: fabbc13d3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173736

Change-Id: If6dc55b12220729c312333b5467a082fb3aebd39
2021-05-16 08:33:49 +00:00
YUKAI HUNG
eb19235bef Merge "Load application icon and label from package manager if available" into sc-dev am: 8d8877b6db am: eb3e1282d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167798

Change-Id: I31d2244c5d7a58f0a5097dd67d71c67f29069e79
2021-05-16 08:33:43 +00:00
Dmitri Plotnikov
a8775d10af Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev am: 26db6e5f8e am: 6af2e84cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162520

Change-Id: I5893b00332e5711754bef8fc1b6288a1fb47ab5a
2021-05-16 08:33:37 +00:00
TreeHugger Robot
96e8466dd7 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev am: ea4ab07b63 am: f79708058a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173190

Change-Id: Ibe9f13b19c087ddae24e10e56d12fab2323505f0
2021-05-16 08:33:31 +00:00
Sally Yuen
8345319373 Merge "Add a banner for RBC/Extra Dim" into sc-dev am: 12166e5bb1 am: 17cc9ffd93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14165431

Change-Id: I2caca9ca743f9e93e1eeac2ea47c33c8e487b1c6
2021-05-16 08:33:25 +00:00