Commit Graph

84626 Commits

Author SHA1 Message Date
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
Dmitri Plotnikov
c2515e9c20 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 am: 6acbd70713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: Iec4786aa45cfdb52a388a3710123aa950c67b3b7
2021-05-15 05:16:13 +00:00
TreeHugger Robot
fbb3409f9b Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 am: e0e26649fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I11cef62cf2588c52cc0fdcf96b2141f67f96ef5e
2021-05-15 05:10:47 +00:00
TreeHugger Robot
c38bda35bf Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 am: 07427eeeb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: Ib2e27d4df23976717c0428e1d142c68909d1ffc4
2021-05-15 05:10:40 +00:00
Yichi Chen
3c5b65fb20 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 am: 97efa6eed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I466e4394ef08941bd0498280dac87c4fa89e17b2
2021-05-15 05:10:34 +00:00
TreeHugger Robot
f7191fd0a3 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 am: 21f81feb86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: Id93ba1a59043d553a72333aa8e1264e5db86cdb1
2021-05-15 05:10:29 +00:00
YUKAI HUNG
51650d3e59 Merge "Add new field for data interpolation usage" into sc-dev am: f988790908 am: 29cc5c19a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: Id736caeaacf64af4f1b6cb0d2f11ea09d6b6c40f
2021-05-15 05:10:24 +00:00
Ryan Lin
ddc3ecb071 Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774 am: 9d46a4fec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: I6d74fc57872b63b69784d940ca68838156db954f
2021-05-15 05:10:11 +00:00
Menghan Li
124dd2d99a Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842 am: 484782bc2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604

Change-Id: I9194417e13b26deaa8cbc2f91d585e33f8761e2c
2021-05-15 05:10:06 +00:00
Menghan Li
7be990b3a2 Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8 am: cc938176bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665

Change-Id: I4d8603ce0bc346b40cc871b6925c671663b967cc
2021-05-15 05:10:01 +00:00
Menghan Li
55159685c5 Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev am: 8270d175b8 am: 055eed3d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409958

Change-Id: I10a3fcc0eba3ca481df8b621568a31c3952d7128
2021-05-15 04:59:54 +00:00
TreeHugger Robot
34ea71e95c Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3 am: cdceaf3602
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960

Change-Id: I8cd4a4e14de77054aacd9d72d310419ff9d3a4bf
2021-05-15 04:59:50 +00:00
Mill Chen
b6fcf2e79f Increasing the character limit am: b4a9916adf am: 71c15d3f18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673

Change-Id: I3431221fa8041418400fb3c02dcc096c92f028dd
2021-05-15 04:59:45 +00:00
TreeHugger Robot
dd9c4d37ab Merge "Update password & account settings icon size" into sc-dev am: b0bd79d468 am: ea8d23e3b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408664

Change-Id: Ib22149efa4c4e368302ecb52be8469e47d4e47e5
2021-05-15 04:59:42 +00:00
TreeHugger Robot
5d037d2196 Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6 am: a130f44094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661

Change-Id: I4ad357c34c6a951b5d815f3602bfed5a6852b76c
2021-05-15 04:59:37 +00:00
TreeHugger Robot
d85c089e2c Merge "Update the category style in pair new device page." into sc-dev am: dc0613d172 am: dc9beae9ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408656

Change-Id: I19751e75e2620207e8d400e96915e99e63ebf08f
2021-05-15 04:59:33 +00:00
Wesley.CW Wang
90ba23c812 Refine battery help message layout am: 2369167d63 am: 0c97d1b69e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352143

Change-Id: I8126f0b029012411e7b0dc0ed37e7afc98e4d695
2021-05-15 04:59:28 +00:00
Wesley Wang
b17fb7541e Merge "Update batter saver page footer (1/2)" into sc-dev am: 12bc0921ce am: 1a9df9004f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352147

Change-Id: Ic1de13b76f1708176b10ec377d56e71817945b2b
2021-05-15 04:59:23 +00:00
YUKAI HUNG
213a6c6bce Merge "Refine the app/system section divider content show/hide rule" into sc-dev am: 16b60aa2d7 am: bc91fe41da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327009

Change-Id: Ie4dc31c22d70e1bcc7a06992a6e188985c208af2
2021-05-15 04:59:05 +00:00
Bill Yi
b1d10f6842 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f1ae5d67a -s ours am: e8b350c1c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3be124c4e9b7b5abfa7dce8d1d7032a822de3853
2021-05-15 04:58:39 +00:00
TreeHugger Robot
1ccb74494d Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev am: 6907a1feb8 am: 670c578014
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352470

Change-Id: I62356d3937223d562379589a84d701e0a3f4e5f8
2021-05-15 04:58:35 +00:00
TreeHugger Robot
02ed8d8778 Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1 am: 8133c1f6ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125

Change-Id: I9cc6afc223b48e0961bc35574ea6114940572051
2021-05-15 04:58:30 +00:00
TreeHugger Robot
567e796e30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a -s ours am: b1802372ab -s ours am: c830499aa5 -s ours am: 43d2800863 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibffbcd2e69c3668f29b2b53c86a5fbce153812a5
2021-05-15 04:58:26 +00:00
Bill Yi
4037c9d0ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours am: 226146afee -s ours am: 93c1e94f12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31709aff30a77ff1ee5f6f8d7df650a1f2246acb
2021-05-15 04:58:22 +00:00
TreeHugger Robot
61a2a7d3c4 Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0 am: 4e563710b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126

Change-Id: If9d983d90bfaba928c5e1aed3915c046ebf5af53
2021-05-15 04:58:18 +00:00
TreeHugger Robot
3a0cb3f14b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours am: bf0ef5b73a -s ours am: 3693498d2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I203b65d8d8e04a468a5e9745cf5a1fd70f8ef5ae
2021-05-15 04:58:12 +00:00