Commit Graph

81617 Commits

Author SHA1 Message Date
Jason Hsu
f39be2afea Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c am: 7649fa90f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: Ie9cff4e328fdec2c967e6c54309bc2cabd936836
2021-05-06 05:49:53 +00:00
TreeHugger Robot
400cca93b4 Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc am: 17877ef23e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: Ie7b7bac2f5b8956f6f74c1bdef702ffbe1703d0a
2021-05-06 05:49:40 +00:00
Jason Hsu
7649fa90f7 Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: Ia51c9a07e0aca890c746906abf35ef8a5c5d821c
2021-05-06 05:29:24 +00:00
TreeHugger Robot
17877ef23e Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: I479cc73697ab81973f04f8ba7ead8e26cb439688
2021-05-06 05:29:02 +00:00
Jason Hsu
8caef2218c Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev 2021-05-06 05:18:50 +00:00
TreeHugger Robot
3aca460dfc Merge "Update Prevent Ringing summary when it turn off" into sc-dev 2021-05-06 05:07:25 +00:00
Les Lee
f7f80cbec2 Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8 am: a9ca9bec05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446

Change-Id: I331c1524bde3d55a118bf2d95534850bd73a0963
2021-05-06 04:15:34 +00:00
Les Lee
a9ca9bec05 Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446

Change-Id: Ide9fa05ddab430487c903a49f14e37fbdef49e24
2021-05-06 03:53:29 +00:00
Les Lee
0dc1ee01f8 Merge "wifi: Use new API for wifi data usage function" into sc-dev 2021-05-06 03:17:20 +00:00
TreeHugger Robot
6c1e450359 Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28 am: e6e27e32bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968

Change-Id: Iba77df02a2fa1e69cf1742f4062c45c0f8f5665b
2021-05-06 02:57:25 +00:00
TreeHugger Robot
e6e27e32bb Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968

Change-Id: I2a890de31d8986b9781a3eb085f8fd295ef72b4a
2021-05-06 02:21:06 +00:00
Weng Su
2452d722e9 [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: b43f98b65c -s ours
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: Ie5ad917766eddff4a78dc954b5521b3bd952f14a
2021-05-06 01:54:58 +00:00
Jeremy Goldman
0f8711450b Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3 am: 8c07c41e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936

Change-Id: I9a51161c174fcc8b64dc74401deb603bea980cd6
2021-05-06 01:54:37 +00:00
Weng Su
312e7f028d [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: a2b6fa6d46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I70b071a8ec4bf27d1288153c3d2f90d746162b10
2021-05-06 01:53:39 +00:00
TreeHugger Robot
f396c0af28 Merge "[Provider Model] Fix settings crash issue" into sc-dev 2021-05-06 01:52:53 +00:00
Weng Su
b43f98b65c [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 skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: I2257f4e5c1aba94edb3245ba85d71c520739b209
2021-05-06 01:29:53 +00:00
Jeremy Goldman
8c07c41e73 Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936

Change-Id: Idc1107134c06c395f73a7b4ac9f53f18291d1027
2021-05-06 01:29:46 +00:00
Weng Su
a2b6fa6d46 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I90270144eb2d7dab6527eb024f5bce1ec251c789
2021-05-06 01:29:20 +00:00
Weng Su
2f3389ff0c [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 skip reason: subject contains skip directive

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

Change-Id: I36aa2286aec58e930f4f868d3c092b7629c402d6
2021-05-06 01:28:54 +00:00
Jeremy Goldman
0a6a6269e3 Merge "Create unit test for the VpnInfoPreference" into sc-dev 2021-05-06 01:08:35 +00:00
Weng Su
6e761235fd [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 skip reason: subject contains skip directive

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

Change-Id: I777137193db9eb406825545a9d591145d1b8694d
2021-05-06 00:57:51 +00:00
Weng Su
e304f37927 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 2e9640d5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: Ibaef95b9f82be90e11e76af1838b4561087ac062
2021-05-06 00:57:15 +00:00
Weng Su
7a8de548ce [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: Ia231ae0efc338828b1cdf84d1330234b10af0aaa
2021-05-06 00:42:38 +00:00
Weng Su
2e9640d5b0 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: Ifcf837b36c99311ada4c7e1655dbd8a6b6ac6ad7
2021-05-06 00:41:08 +00:00
Weng Su
41b7d11496 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -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: I76f3b2ce80dd10bffb768862de34bc94b1f3d4b2
2021-05-06 00:16:30 +00:00
Weng Su
632eb0d54a [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I45816ca240725b57db5a68ac1b960dab5b8f1b0b
2021-05-05 23:59:31 +00:00
Weng Su
88cafbaa24 [Provider Model] Fix settings crash issue
- The GlobalSettingsChangeListener needs to be closed after the life
cycle is destroyed

Bug: 185756174
Bug: 186404332
Bug: 186591527
Test: manual test
atest -c InternetUpdaterTest

Change-Id: I9fbad3b303055c6c7a61ccad8efe69cefef56c58
2021-05-06 05:53:41 +08:00
TreeHugger Robot
d334d18b59 Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f am: a5d73fdde8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937

Change-Id: I5023922b6ea2887d4a0a19cb87847d34b2674336
2021-05-05 18:30:35 +00:00
TreeHugger Robot
d2a1068245 Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124 am: 644b7a7c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: Ib8ae3b332d3e3c98d76ab38e3646fcc762fc563e
2021-05-05 18:30:01 +00:00
TreeHugger Robot
a5d73fdde8 Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937

Change-Id: I2c0b8e0da20ecee7ae980b7a924f14d9044083ee
2021-05-05 18:14:42 +00:00
TreeHugger Robot
644b7a7c11 Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: If2b8f0ff72a87ec43e10ec7a69afe59b76db3536
2021-05-05 18:14:25 +00:00
TreeHugger Robot
f9ebf6600f Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev 2021-05-05 18:06:07 +00:00
Edgar Wang
aa48592b40 Update Prevent Ringing summary when it turn off
Bug: 187145174
Test: manual & robotest
Change-Id: Ifc06a38ff65f084db2803c56b5a37224c5b9b810
2021-05-06 01:49:24 +08:00
TreeHugger Robot
5dbc9e8124 Merge "Add placeholder summary" into sc-dev 2021-05-05 17:47:18 +00:00
ykhung
9db43b8f76 Add new constructor to create BatteryHistEntry from interpolation
https://matthew-brett.github.io/teaching/linear_interpolation.html

Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6dbdb3db8243e40bc54bde3aab7157fda2719de9
2021-05-06 00:42:14 +08:00
TreeHugger Robot
8e65bf1fb2 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7 am: 64d97239b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399

Change-Id: I817095efc5c0e053790ffa9c7964e4db292b7138
2021-05-05 14:45:15 +00:00
TreeHugger Robot
64d97239b6 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399

Change-Id: I790924e31309ea7a9acecc73edc8e985c6a533b8
2021-05-05 14:32:05 +00:00
TreeHugger Robot
87fd902250 Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d am: 69f08ccadf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316

Change-Id: Ic57214aa094f3ff2c485a2cad19c7d3d5275880c
2021-05-05 14:23:34 +00:00
TreeHugger Robot
ea1d3228b7 Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev 2021-05-05 14:18:18 +00:00
Julia Reynolds
01ca4818b5 Add placeholder summary
So the scren doesn't shift when the summary is added
asynchronously

Test: manual
Fixes: 183474692
Change-Id: I658191de1e53140b823e06a5f7959dc77e5a7fcb
2021-05-05 10:13:46 -04:00
TreeHugger Robot
69f08ccadf Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316

Change-Id: I93ee3aa78a4ed230c577effda75d491cc09546e0
2021-05-05 14:07:18 +00:00
TreeHugger Robot
660341876d Merge "Fix the different color between status bar and action bar" into sc-dev 2021-05-05 13:30:13 +00:00
Betty Chang
fd01c94e11 Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc am: cacc766087
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448

Change-Id: I4c1a5f553feceeeee1c663fbe484a5dde52ac3d3
2021-05-05 11:27:53 +00:00
Betty Chang
e24630db50 Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26 am: 8103e62f57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397

Change-Id: I036bb32bb0817f9f502e62b01486a259638ac77b
2021-05-05 11:27:06 +00:00
Betty Chang
cacc766087 Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448

Change-Id: Ia1cfe3fb52da7247b0daa3f67a2053f97cffb382
2021-05-05 11:12:16 +00:00
Betty Chang
8103e62f57 Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397

Change-Id: I3cefc5c4cf7090c46cd30a68a014eb87a0513b17
2021-05-05 11:11:44 +00:00
Betty Chang
407e6650bc Merge "Fix a NPE when forget wifi network" into sc-dev 2021-05-05 10:39:29 +00:00
Betty Chang
1637f3cd26 Merge "Add scrollView with config layout and button layout" into sc-dev 2021-05-05 10:39:13 +00:00
Tsung-Mao Fang
d3cd751f02 Apply dynamic color for Erase all data(factory reset screen
Enable the dynamic color flag, and remove some unused theme in layout.

Test: Rebuilt apk and see the screen
Fix: 185557130
Change-Id: I7ed73c808be4942e5ffd461982e73a4ff7f7f2db
2021-05-05 18:14:48 +08:00
Menghan Li
67d6749c16 Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc am: 058ea1317c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939

Change-Id: Ie8e72a024a7fa4156be1c929ad066fed6db9af41
2021-05-05 08:55:09 +00:00