Commit Graph

84901 Commits

Author SHA1 Message Date
Edgar Wang
17afc01081 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15 am: f138b5698f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003

Change-Id: I1cd031b92d4ec0413d07c3535e0d74afaf9d909e
2021-05-20 01:24:54 +00:00
TreeHugger Robot
eab2a803f4 Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837 am: cd6ba4729e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513

Change-Id: I9e75abb4ff66641e09f4168e0962f0507d791ac6
2021-05-20 01:24:46 +00:00
Xin Li
8e620f6da7 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours am: a59b3c62f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a8f8b60902ca0bd288ffc2e770a90228e1e01dc
2021-05-20 01:24:39 +00:00
TreeHugger Robot
db7a758b96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours am: 3e68751b19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c6d381a9f2ac830e4760fcd2062f2509d598526
2021-05-20 01:24:30 +00:00
Bill Yi
73cc256c60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours am: b78df94b0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4792ee0c3516e376c052c5d36b09873ddf7e3ae4
2021-05-20 01:24:23 +00:00
TreeHugger Robot
6594eb6ef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours am: e5f95ccebb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0efb8271b4fd4de02e93d57839dc362b8d03ba7
2021-05-20 01:24:18 +00:00
Bill Yi
5f6b5a3571 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -s ours am: d0d652158b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ed32bb760498331157481dd7b1620e2a129e074
2021-05-20 01:24:11 +00:00
TreeHugger Robot
ebc95f7031 Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc am: e5827e7c40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204

Change-Id: I0397f6db268be578e25a9f5af2af60c6864bd998
2021-05-20 01:24:05 +00:00
ykhung
68a3bf1a86 Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f am: 0123899fca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006

Change-Id: I941814d95817e0937adc9c5fa7acf3258d7ee294
2021-05-20 01:23:59 +00:00
Alex Stetson
0fbecc3551 Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d am: 0252189a12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754

Change-Id: Iac4d6ff6c18ac0f451480cc6db11750b71b8ab9a
2021-05-20 01:18:41 +00:00
TreeHugger Robot
986b2466a3 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 am: 3808ff395d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: I1b8440872d05deb47fd16741289da0e75d729a2e
2021-05-20 01:18:36 +00:00
TreeHugger Robot
e2b18866e5 Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad am: 5e8d1554c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: I8e2246016fdb2599739f9e6c8ee3dfb6db34e7b5
2021-05-20 01:18:30 +00:00
Yanting Yang
3515e91c0c Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb am: 0f7c4495ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: Ibb3ea848d21b2de0ddb7b8e729aec6d63ba80a70
2021-05-20 01:18:24 +00:00
Syaoran Kuo
281e7635f6 Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 am: 283b879e3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I1a5055c34cc259e31515c5a09f8131388082eabc
2021-05-20 01:18:19 +00:00
TreeHugger Robot
a1a1be7113 Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed am: 3b72e00b7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: Ib604d4249b2e5022193162b083fba2f85866579b
2021-05-20 01:18:13 +00:00
Edgar Wang
aa42687197 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e am: 78f5f98a25
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: Id1f6dba44889af79cad76fd86814a33890180ced
2021-05-20 01:18:06 +00:00
TreeHugger Robot
96a0685c5f Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad am: 77fe80dd73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I0235dc232acbd1cff0ece95bd533a920c1af6cd4
2021-05-20 01:17:59 +00:00
Treehugger Robot
1f20ea28d4 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59 am: ca26867de4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: Ie2e6c576871062551f04dc8c97c3b4f116515e1e
2021-05-20 01:17:54 +00:00
TreeHugger Robot
f0664ff776 Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6 am: 2929cdd115
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I25c5e5d432001fb94a4f7b83bf19e9e3256918e5
2021-05-20 01:17:48 +00:00
Betty Chang
b61476a849 Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1 am: e7f72efe61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413

Change-Id: Ib08ad5c4a7ebaa6005900510374430faff174761
2021-05-20 01:17:42 +00:00
TreeHugger Robot
037003d033 Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052 am: dce7f21a9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406

Change-Id: Id23d5eca3761df81702123992b4cf41b838f2a4f
2021-05-20 01:17:37 +00:00
TreeHugger Robot
8b933ac05b Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd am: 57f25c2fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: Ib060dc1513e40f196de00e347af184ecde5f0cf8
2021-05-20 01:17:31 +00:00
Julia Reynolds
37fd70f60c Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27 am: 7abbde1371
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218

Change-Id: I76f6c71e42b54867847ee9fbbe9274d1f4bf8a0c
2021-05-20 01:17:26 +00:00
TreeHugger Robot
b959c76341 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684 am: fedaee8113
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217

Change-Id: Ia3e8cd4917b75169e4fefe4491987d74ea439ad7
2021-05-20 01:17:20 +00:00
Menghan Li
fc0fdda74e Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 am: e080e67847
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: I3bfd48516085b752de192be74bdc921e280d6b66
2021-05-20 01:17:14 +00:00
Menghan Li
148dc9427c Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b am: 9d50ac0ab0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: I75c9e18e07c8eaacdbd5d44617275db4b5f58c0f
2021-05-20 01:17:09 +00:00
Les Lee
63eaedcce4 [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours am: 403473ef38 -s ours
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: Idc2ae5ff18518e7dd588423d1d581f295a4bfbb8
2021-05-20 01:17:03 +00:00
TreeHugger Robot
b2f7505182 Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada am: 7e253d8c2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866

Change-Id: I26646287e8b3e8153c680e2b67fd9ded6683e2d8
2021-05-20 01:16:56 +00:00
TreeHugger Robot
a2036a2bb6 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours am: 461b72cdc7 -s ours am: 58b769c7d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5df0cfb74506c93aadae1b225312c39d47c50dfb
2021-05-20 01:16:51 +00:00
TreeHugger Robot
6a2fb46c60 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fd32dc93c9 -s ours am: 2c30777afa -s ours am: fb3cf97a7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92fbd70667852532cc1ba15cdbbc962453f85528
2021-05-20 01:16:46 +00:00
Yi Jiang
c5503e55c5 Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c am: 7c34fa7e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109

Change-Id: Iaea3f01e542c3d2b17f013ba3028dd3de7a8b287
2021-05-20 01:16:40 +00:00
TreeHugger Robot
865b230d7e Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3 am: e180cdec63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I0b356fb4ff87059a7134f6cd0930c6130da21984
2021-05-20 01:16:35 +00:00
TreeHugger Robot
e8ed39ebfe Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a am: 9e7e20704f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

Change-Id: Iade703825e071e46359256bb7bb8e79177df402e
2021-05-20 01:16:30 +00:00
TreeHugger Robot
550a6202d5 Merge "Update battery settings string" into sc-dev am: 1ae9a706ff am: 0887761e6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: I60ddba043cc7bf96901d1bee69857b0cc86bdaa9
2021-05-20 01:16:24 +00:00
YUKAI HUNG
91e0e66fdd Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea am: 7452491629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: I0679dc13ebe26698e8b2b086d622d1abda92d16f
2021-05-20 01:16:18 +00:00
TreeHugger Robot
f394946e57 Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe am: 1f00925c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I68997e13accac1583a4d9ff447bea11943996d6a
2021-05-20 01:16:12 +00:00
Jason Hsu
c1b8e99c24 Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c am: 1b23d619b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: Iff6fd6fd9859209550d85eef21439c72c03ae9ce
2021-05-20 01:16:07 +00:00
TreeHugger Robot
bb4f8483bd Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc am: cb07496c14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: I3b68a6bd6ed5f5cfc7acfc23d9b2e27b33b89b32
2021-05-20 01:16:01 +00:00
Les Lee
93dc161479 Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8 am: ab3528dc86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446

Change-Id: Ibc1438d794fd2dc062b8bf99bd33def6c74abf29
2021-05-20 01:15:56 +00:00
TreeHugger Robot
afc4f48897 Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28 am: a59fe14784
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968

Change-Id: I8e956a04f12d5724cc6d8a23756813c56f954fd5
2021-05-20 01:15:50 +00:00
Weng Su
1ee225f32c [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 2e9640d5b0 am: e304f37927 -s ours am: 2f3389ff0c -s ours am: d2c87251c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic2f981fdd5b31411119b3333908da7dffe0303f6
2021-05-20 01:15:44 +00:00
Jeremy Goldman
609d730132 Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3 am: 3266345a56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936

Change-Id: I28c58f3fe29d4e38f3694ceb75d18e23229a53b2
2021-05-20 01:15:38 +00:00
Weng Su
bac6724ebd [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 7a8de548ce -s ours am: 6e761235fd am: b4e67f049b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66d6b5083c9fdc2fa9d9da3309cd4a4db045745c
2021-05-20 01:15:33 +00:00
TreeHugger Robot
e9f84d4954 Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f am: 7024c27f8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937

Change-Id: Iaac021e3b30afcc6806b3378f7865ba82ebcedd6
2021-05-20 01:15:28 +00:00
TreeHugger Robot
9ea3d521d0 Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124 am: 712a9f3c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: I2b1df7c5878adf189eb788090f75b89bbc0c194d
2021-05-20 01:15:22 +00:00
TreeHugger Robot
885dd63655 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7 am: d5d3c7c768
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399

Change-Id: Iff85b9585083774e7c08d6bfafeb6a975941858e
2021-05-20 01:15:17 +00:00
TreeHugger Robot
ed38b6231a Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d am: 1ccf7b5975
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316

Change-Id: I050aa7af94f957761c1b9be0b9809e5d5386e129
2021-05-20 01:15:11 +00:00
Betty Chang
6ff88f0c39 Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc am: 23c1ad4123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448

Change-Id: I7fd9c8762f7e31bae8c98dc7e8ae78ba3afd1c84
2021-05-20 01:15:06 +00:00
Betty Chang
db08ca0830 Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26 am: 58318ccb5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397

Change-Id: I8d91e3de6d1ad1d1cef5fa17f579194f8058dcf5
2021-05-20 01:11:30 +00:00
Menghan Li
2fbcc8a1cd Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc am: 1aa7f9c3ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939

Change-Id: I814d1da68060a0019062b26295514e95e3e4729b
2021-05-20 01:11:25 +00:00