Commit Graph

84150 Commits

Author SHA1 Message Date
TreeHugger Robot
1b6cbbbde8 Merge "Fix unable to change language" into sc-dev am: 4cc4b47adf am: 5619486876
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292671

Change-Id: Id492709516834a60ea09be986f1030793f368b11
2021-05-16 12:17:26 +00:00
Joshua Mccloskey
9c98ad79c9 Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c am: a5ba299ab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131

Change-Id: I2a662e654c5fd0e922ac6a41b9bf0f7f691d9d86
2021-05-16 12:17:20 +00:00
ykhung
0ecf5176de Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13 am: 3a6bdd5c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195

Change-Id: I679bfa528db174e5547f0a85da5052f16803fd41
2021-05-16 12:17:15 +00:00
ykhung
22141b00ef Refresh category title by different time slot condition am: 41fd8a7494 am: 3fa5df6ec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187

Change-Id: I60840b9615f44c1d8718ee353b457821e2c9fbe8
2021-05-16 12:17:10 +00:00
Santos Cordon
19f15b449a Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf am: f7b6e27c94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526

Change-Id: I1c6e96c2b704530ab01ba9b89cff3b35871c3982
2021-05-16 12:17:05 +00:00
YUKAI HUNG
5bce596465 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0 am: 34f4df5a48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275

Change-Id: Iabbf8bf9d37c9666988998efbaf6597e336987ce
2021-05-16 12:16:59 +00:00
Julia Reynolds
bae913a428 Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7 am: c74fcc9f52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890

Change-Id: I775c2b353a56f1df1276ab5ea51215c76e9997bc
2021-05-16 12:16:53 +00:00
TreeHugger Robot
feedf9bc99 Merge "Do not auth in settings if UDFPS" into sc-dev am: 8eec01fc17 am: 8dc93befa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282593

Change-Id: Icff7431b9f2f188471a8c566469ff0767809af85
2021-05-16 12:16:48 +00:00
Chloris Kuo
656892afff Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d am: 4a1526263f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599

Change-Id: I98c76f0443a6723ff136f4e9f783f30d5059579b
2021-05-16 12:16:42 +00:00
TreeHugger Robot
1f194ecdbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours am: 9f5f9bc960 -s ours am: 1861ec1bd7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10666776882df2ce7a916e0161e6660417dd67b1
2021-05-16 12:16:37 +00:00
Bill Yi
ab3bf55cb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours am: 4e9da6061d -s ours am: 6df96fb9e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbe721763b8ac5f37e9ae88160aabe3610118e38
2021-05-16 12:16:32 +00:00
TreeHugger Robot
65289e5317 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours am: bed3b3f0d6 -s ours am: 099e91276c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5089d4921fb76af3b748cde4db9091be60b66f69
2021-05-16 12:16:26 +00:00
Bill Yi
7a24b53766 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours am: d7726af0d1 -s ours am: b1e98782ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2965dc18b3aa22f9c53e76623906523eee1dd13
2021-05-16 12:16:18 +00:00
TreeHugger Robot
113a278525 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f92d565f22 -s ours am: 13cae1a933 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a72135604676bb22e82f70d2bfcc61d38435ae9
2021-05-16 12:15:45 +00:00
TreeHugger Robot
9a1d07bfda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 45a5592fd7 -s ours am: bd90819601 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97c3bf276b4d16ca85600f0633ec1b79815312a2
2021-05-16 12:15:41 +00:00
Julia Reynolds
0aa05c302f Merge "Add enterprise popup to notif lockscreen settings" into sc-dev am: 16861ac068 am: ee8f3b2273
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14284498

Change-Id: I637cff94d86d0f00ea415c2f86fb9e98c04a424a
2021-05-16 12:15:35 +00:00
TreeHugger Robot
bf32f5863a Merge "Use new api to get bluetooth device icon" into sc-dev am: 3bcd6bade2 am: d4e0b49451
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14250087

Change-Id: Ie496d95e810fa3f99e6bce78820ee52bc076bb3c
2021-05-16 12:15:30 +00:00
Almaz Mingaleev
50d8091234 Do not show toggle for location tz detection in search. am: 6be940f396 am: 32c3f4b5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293706

Change-Id: Ib24e1373240d3c9fbbd5f54f2425081dd414ed7b
2021-05-16 12:15:24 +00:00
TreeHugger Robot
8bfac392f9 Merge "Fix background inconsistency of the font size page in SUW" into sc-dev am: ea7b64a96d am: d2fc3c92dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14290949

Change-Id: I3d8bcdaefe96279886a81e06a886fabfe51bada5
2021-05-16 12:15:19 +00:00
TreeHugger Robot
95236ec275 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 47b254ad88 am: f6e51af73c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111132

Change-Id: I4eeebc005f53a14d9e3bb16e3f7304e17fd0c3a6
2021-05-16 12:15:13 +00:00
TreeHugger Robot
43df28eac6 Merge changes from topic "biometric_page" into sc-dev am: 3e6e4a1ad5 am: 388527bc40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14276566

Change-Id: I05dcfe58649afb5cc270470abdae9d78eef88357
2021-05-16 12:15:08 +00:00
Christine Franks
43f9657c49 Merge "Support vendor modes in color mode preference" into sc-dev am: 10da1de13e am: 8437c5cd91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128858

Change-Id: I0d4917bc425f6c9aa3b04104d46a3119b9627a0d
2021-05-16 12:15:02 +00:00
YUKAI HUNG
d9820926e6 Merge "Avoid add preferenc again if it already in the PreferenceGroup" into sc-dev am: 81399d6fec am: 57fbe19791
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281934

Change-Id: Icc25a422173f9aff039fcda25c6bfc77b780a3e4
2021-05-16 12:14:56 +00:00
Jason Hsu
cfb6c0f77e Merge "Add string for search keywords in accessibility settings" into sc-dev am: 908a2ba2a1 am: 2489d5c5fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14288497

Change-Id: Ieb5a30a37a6cc26bbcc42ff4c5c02a77d13a859f
2021-05-16 12:14:50 +00:00
Yanting Yang
5b94188b1d Merge "Add a new summary for homepage preference of security" into sc-dev am: 3ab0a24370 am: fc7ed5bd5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281031

Change-Id: Ic910076f123763f983845005c747671fba416d31
2021-05-16 11:50:30 +00:00
TreeHugger Robot
1d07a7aeee Merge "Remove "See all" button" into sc-dev am: f05822549c am: a00832822f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283743

Change-Id: I5a55212f7200f74f81061219038e31f228e0e071
2021-05-16 11:50:23 +00:00
Treehugger Robot
1ea7a76deb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours am: 220ba05109 -s ours am: a0a5760ff9 -s ours am: 16f3036c4b -s ours am: e15549a3df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib11819862bb61a77d8e179d53b80ee24a979923b
2021-05-16 11:50:18 +00:00
Treehugger Robot
b4acd86318 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours am: dda5464180 -s ours am: c17720247e -s ours am: 929bde97a4 -s ours am: 7812b2e833 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c345c5baf8771505b37dde66c6d6adce29eb75e
2021-05-16 11:50:12 +00:00
Treehugger Robot
ac258f02c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours am: ab17423f8f -s ours am: 802d9f3c8f -s ours am: 06cedc7e3b -s ours am: f84734902b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia565a1aa07d93ac103b2339b093350660fc5e37f
2021-05-16 11:50:07 +00:00
TreeHugger Robot
421394baad Merge "Change "Manage location services" to "Location services"" into sc-dev am: 9064ecd051 am: 884490487e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271284

Change-Id: Ib93c174fd920ca5ead1b07258f8464307625379d
2021-05-16 11:50:01 +00:00
Evan Severson
ab11ff2001 Merge "Update mic/camera toggles api" into sc-dev am: cbc3bc5acd am: 20dd13c1f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193836

Change-Id: I1725d940efaca9b9cec48f7a5fe73cc6e5f63648
2021-05-16 11:49:55 +00:00
Yomna Nasser
895544029a Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev am: 7299387774 am: 90c06c5543
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14218034

Change-Id: I686be46542fb62b48a289234e14dd9912a401df7
2021-05-16 11:49:49 +00:00
Menghan Li
dd637036a9 Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev am: 09f6086bea am: 46ec32a684
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255419

Change-Id: Ia1d4e644ee74e3c55dfd1d6d1d38666e088f0a92
2021-05-16 11:49:44 +00:00
TreeHugger Robot
8d87eebf30 Merge "Replace to correct footer preference style" into sc-dev am: 913dd4c8a0 am: c7dd99af68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271576

Change-Id: I8472108b4007bd921b10a74f3b3ac11dd5e7c731
2021-05-16 11:49:38 +00:00
Wesley Wang
0b5bcf70e8 Merge "Update app usage page active time format" into sc-dev am: 6ffcf8bfa9 am: c99ce53e7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14264141

Change-Id: Ie740bd7b5793b1ec88b788269de7f93a1902fae7
2021-05-16 11:49:33 +00:00
YUKAI HUNG
9d72bf3f47 Merge "Implement expandable item for system component usage data" into sc-dev am: 7144b6fe5d am: 87714e3201
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266965

Change-Id: I872ebf791c23b71c7b4c5cd11c3e890d3d781588
2021-05-16 11:49:27 +00:00
Joy Babafemi
ce9633a98c Merge "Add UWB Settings" into sc-dev am: a1fe5ec083 am: bdf6d289be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14240457

Change-Id: I0b4976136cf7405f047544eece36814575857147
2021-05-16 11:49:22 +00:00
Jeremy Goldman
840c5a5288 Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev am: ef7fd39f91 am: a822085b71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233634

Change-Id: I0bf2cd1edca5f472b1d636ceb68e60668d9db6e4
2021-05-16 11:49:16 +00:00
TreeHugger Robot
472961b523 Merge "Update the style for collapsing toolbar" into sc-dev am: ea2a359561 am: 5abd10ed60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199749

Change-Id: If03cb09bf4b4d414dc4005ab0195505b83a71d29
2021-05-16 11:49:11 +00:00
PETER LIANG
4a2ba26b42 Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev am: f71aad11e3 am: 2919b6785c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265788

Change-Id: If01f00e633474271b05965cd51bf917269d795a8
2021-05-16 11:49:05 +00:00
Chloris Kuo
1b9591bcc9 Merge "NAS setting migration" into sc-dev am: 1a44af9585 am: f52898401c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14259014

Change-Id: I2027f68588943b64462bd0c325352ecc10e75829
2021-05-16 11:49:00 +00:00
Curtis Belmonte
d644402cec Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341 am: c17e2e75a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139

Change-Id: If48674953eddcfff12ba68ea11af37af0e096ab6
2021-05-16 11:48:54 +00:00
Neil Fuller
ec4ab235d5 Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc am: 297ba96a01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: I0e674fa6e78062dc421eeb17e42fdf8c7c617a35
2021-05-16 11:48:49 +00:00
TreeHugger Robot
5b656d740e Merge "Notif history styling updates" into sc-dev am: b768489fa0 am: ffb9e456d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: Ibecf55f6828a490c3316b02b7145743225493467
2021-05-16 11:48:43 +00:00
Sally Yuen
6eafcac06a Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465 am: 8a495fd55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: I3e7397c050df1e34daa84c770061fe1e557c382a
2021-05-16 11:48:37 +00:00
Julia Reynolds
8a2d7e0496 Merge "Use a new string for category headers" into sc-dev am: 5770b4e928 am: b1dda2487f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265928

Change-Id: I2620f882e904e0aaa46611caf18244022679150f
2021-05-16 11:48:31 +00:00
YUKAI HUNG
81b3ead116 Merge "Add new expandable preference component" into sc-dev am: c6c3b383da am: 038ea6c4cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260595

Change-Id: I87ab946d14b0b21a95a8ff1a4663d3eec8a49d15
2021-05-16 11:48:26 +00:00
TreeHugger Robot
20556da72f Merge "Notif history Long tap functions as short tap" into sc-dev am: e1b63f00a2 am: fbc72482e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14254102

Change-Id: I7c7f80401d5bf1b5b2c65c010d3cb8331c6d69da
2021-05-16 11:48:20 +00:00
TreeHugger Robot
92538414b1 Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev am: 7f065adfcb am: b4678cd9a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255423

Change-Id: Ie40d3cd96d346e05d1c9822658bfd34197d0d47c
2021-05-16 11:48:15 +00:00
Matt Pietal
14edf2dbb2 Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e am: aa0062c92f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389

Change-Id: I94db4f82632e1b54b5ad157bd73cb44dcafc002c
2021-05-16 11:48:09 +00:00