Commit Graph

83358 Commits

Author SHA1 Message Date
SongFerng Wang
c26f8788f7 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5 am: 3333935a67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929

Change-Id: I477a0f9bb7bea46e72dd6aafdc7ed28a111e2a1f
2021-05-16 12:40:41 +00:00
Tom Hsu
45e3441821 Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142 am: 563198613f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782

Change-Id: Ie03e422ab560dbcb81f4624bcb6c6d4393856941
2021-05-16 12:40:34 +00:00
YUKAI HUNG
14073ff231 Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1 am: 8b589f1a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007

Change-Id: I4b5f20073f58bbce3cb20a55d43ebd1a46dc61b9
2021-05-16 12:40:28 +00:00
YUKAI HUNG
aab9f4fd34 Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev am: 70c872c160 am: 5f84a08a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319868

Change-Id: If407f7ff97d4483ba5210a4105edea1e65036369
2021-05-16 12:40:23 +00:00
Kevin Chyn
625f1c3523 Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6 am: 28f4ca0eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069

Change-Id: If12a722516aa6c41c12a6d38c7ba29ca7872857f
2021-05-16 12:40:17 +00:00
Kevin Chyn
f99f893238 Update FingerprintEnrollIntro text and icons am: 28d635d9aa am: e7772a480e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330066

Change-Id: Icab250db023c64e51a807f675770d8a25deea781
2021-05-16 12:40:12 +00:00
TreeHugger Robot
b7ec3843f2 Merge "Revert "Remove "See all" button"" into sc-dev am: e37695c89d am: b9b4fc5d12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14324027

Change-Id: I6d325004daf9b1a7ccef91ed152ddc9b7040b128
2021-05-16 12:40:05 +00:00
Alex Johnston
5c6fbeca91 Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev am: f3be8a6cc8 am: 26790a85ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296227

Change-Id: I43b64730bc2f2741c2b59201e06fc5d3105c4138
2021-05-16 12:39:59 +00:00
Jakub Pawlowski
d7c13da873 Fix app name label spoofing am: 54e74cae5f am: 3aad6a6fc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076525

Change-Id: I684d6f92af9c37a382a0966c629e5aac02301f54
2021-05-16 12:39:53 +00:00
Adam Bookatz
9e2c27b03d Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev am: e035a81ddc am: d231fdcaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282598

Change-Id: I775b9db3f8ba1751c52cda6e4493c33c80b7d4b4
2021-05-16 12:39:48 +00:00
Automerger Merge Worker
d6865f2a00 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev am: 7fe923eec3 -s ours am: 65644f1ad6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic39fd69a3c4d340b6e2770e8ec21a2a8039f2def
2021-05-16 12:39:38 +00:00
TreeHugger Robot
5464daa668 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours am: 0509118fc5 -s ours am: a869b41995 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80b35c9d7224b2f4ba77c1f307cf87e32d2fcfe1
2021-05-16 12:39:33 +00:00
Automerger Merge Worker
8095abe04d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev am: 8b3e1ed7ac -s ours am: b6dc76e6dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: If238b23a30886bacf954aa6f3aea6b626aaae4fc
2021-05-16 12:39:28 +00:00
TreeHugger Robot
4c62c3631a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours am: 9761ce3e93 -s ours am: 2f4509dfb9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If13ffc20155c0598e042645c936fe1edacace543
2021-05-16 12:39:23 +00:00
TreeHugger Robot
d7bd44cc53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f69ba03181 -s ours am: 981f61e134 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97f4dc301132ab7165b6598fe44aa1829aaa441a
2021-05-16 12:38:56 +00:00
TreeHugger Robot
997ac9c39e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a2a94ad379 -s ours am: 4ef2e056ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01502c4de50bb33874a82d5afbbfc8ecee76d3b0
2021-05-16 12:19:32 +00:00
Tsung-Mao Fang
55a0cd4b06 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours am: 744dd99af4 -s ours am: dcc3304de4 -s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I478e925228c82ff1c1aa5f0cc1dfbb9defdff32b
2021-05-16 12:19:27 +00:00
Tsung-Mao Fang
cb92db428a [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours am: 78de74aa57 -s ours am: 546d95c57d -s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I3a6efbec8bae26d4837065dca5d690427ffe3380
2021-05-16 12:19:12 +00:00
YUKAI HUNG
8b2530dcea Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev am: 95b5d0393d am: 014706d450
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319865

Change-Id: I4a1723f10641e6492f86fe2eef40679c320ff6b8
2021-05-16 12:18:58 +00:00
Jeremy Goldman
e451b8f10b Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6 am: 85de104c6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637

Change-Id: Idd17b17f645b56f323fd06739e5aa913e3bbe221
2021-05-16 12:18:53 +00:00
Yanting Yang
1b92097b81 Merge "Update homepage icon for Wallpaper & style" into sc-dev am: 72ba46a9bb am: f846e9108b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319863

Change-Id: Ib1580d5016bf22e0da619f5dfb09cc99fd60a1a3
2021-05-16 12:18:47 +00:00
Lucas Lin
1233fd660c Merge "Use [set|get]PrivateDnsMode directly" into sc-dev am: 614f653aeb am: 97dd9ed21b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230401

Change-Id: Iac7973488799f4d289c8d99603b55e23c971e21a
2021-05-16 12:18:42 +00:00
Joy Babafemi
5396036173 Merge "Update UWB toggle state with a getter API" into sc-dev am: 4b19eae08b am: 6e2ee60708
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283946

Change-Id: I398115313dcb1685329c630c1e39a69e64f1492e
2021-05-16 12:18:37 +00:00
Yanting Yang
c1b43212c2 Merge "Update string for the wallpaper title on homepage" into sc-dev am: db74d13d4f am: 05d9f2643e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297856

Change-Id: Ic399b2a4fc928e235a1051aa2b8fabcd2117c45d
2021-05-16 12:18:32 +00:00
Dmitri Plotnikov
a6ab34987f Merge "Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants" into sc-dev am: dd9c9a8c17 am: 3f97ae6990
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14298485

Change-Id: I8a5cb2c5a62cf756f0e0a1b61d25ab5cf47d0dda
2021-05-16 12:18:26 +00:00
Evan Chen
22a64fb955 Merge "Companion Device App showing in Settings" into sc-dev am: e14cc634dc am: 40c712e007
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14148351

Change-Id: I50179402e41220a22d176d534c3b9d06f3e47479
2021-05-16 12:18:21 +00:00
Edgar Wang
c220483376 Merge "Remove divider in Date & Time Settings" into sc-dev am: c603e02d11 am: ea1862b05b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187783

Change-Id: I4dc6d5be357e843338a0b79034a2331655efeb95
2021-05-16 12:18:15 +00:00
TreeHugger Robot
6905116cfa Merge "Tweak title in privacy page" into sc-dev am: 42e05a07b5 am: f9eafcaec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297858

Change-Id: Ic25707c5d57e4818e06916295c14d5a751debfc0
2021-05-16 12:18:10 +00:00
YUKAI HUNG
490e5c1ca6 Merge "Draw percentage information into BatteryChartView manually" into sc-dev am: f634831de7 am: 7abd861f49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297854

Change-Id: Iee94e79efbac3846d36dbc67ecdd6a765677e84d
2021-05-16 12:18:04 +00:00
PETER LIANG
13a3eb7d05 Merge "Fix the GAR issue of TalkBack said "double-tap to activate" on the slider title of Accessibility button page." into sc-dev am: 921c677320 am: 37d242127c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297848

Change-Id: I5c532dbf4f1e09e270f71c48037d171a7dd46618
2021-05-16 12:17:59 +00:00
TreeHugger Robot
dec5b3072c Merge "Show security screen for ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" into sc-dev am: 5f876de174 am: eac7ce9a96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292670

Change-Id: I020243b4b0bacf5cf5d1af5d6a2abbb553615229
2021-05-16 12:17:53 +00:00
TreeHugger Robot
94673706c1 Merge "Make app usage page support legacy version" into sc-dev am: e39066c388 am: f9dbcb8c21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271580

Change-Id: I25545de479f0f70d0206f88b68242aaff716d07b
2021-05-16 12:17:48 +00:00
Betty Chang
66c9d0fb19 Merge "Add TextWatcher for the ip config field" into sc-dev am: 75d6293a50 am: 381d6f194a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299194

Change-Id: I414544e20ba7978a64c4d292052724bbcc14ac91
2021-05-16 12:17:42 +00:00
jasonwshsu
fb84eb532b Wrap a white adaptive background if it is not an AdaptiveIcon am: 9b284a9af1 am: 590dafc083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233640

Change-Id: Ie3909cd85803ceb63f2e909ba9efa9a10b5b05cf
2021-05-16 12:17:37 +00:00
YUKAI HUNG
ff2f1b6384 Merge "Wrap and carry clicked slot information data for restriction page" into sc-dev am: 8ec6502699 am: ca18b0883d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299196

Change-Id: I2368413342b037d3fc4e665e31618ffcd881d11e
2021-05-16 12:17:32 +00:00
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