Commit Graph

84362 Commits

Author SHA1 Message Date
TreeHugger Robot
2c30777afa [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 skip reason: subject contains skip directive

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

Change-Id: If1bb853639cb83accad5abb75d81eb66aa24a2b0
2021-05-06 07:14:24 +00:00
Les Lee
f38761e027 Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: Id4c98842b11cb4102059fdbbe76d5c4b527302fe
2021-05-06 07:14:01 +00:00
Yi Jiang
9760064c72 Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109

Change-Id: I13a74b84567195bdeca5c3be7bc4dfda5619ecec
2021-05-06 07:08:42 +00:00
TreeHugger Robot
5fa9ab1487 Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I4e5a4e0f55d9eaefee6cc524e8ec0e580209cd5b
2021-05-06 07:08:36 +00:00
TreeHugger Robot
6cb46f5164 Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

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

Change-Id: I159284629ef20ef9faff7a6e6412d77daecbbb48
2021-05-06 07:07:47 +00:00
TreeHugger Robot
e180cdec63 Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I95dea0ef77b8262d5505e2167d73dae1d3ca79da
2021-05-06 07:07:27 +00:00
Yi Jiang
1bfd8eda4f Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109

Change-Id: I77106574c53b936d82030bc8cc027521c77af554
2021-05-06 07:06:59 +00:00
TreeHugger Robot
2c8ed65745 [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 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/+/14352145

Change-Id: I1f266c1eaf5463e5970008dc027ded775be88a97
2021-05-06 07:06:57 +00:00
TreeHugger Robot
95b1b57aff Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

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

Change-Id: Idf7b10b0aa75cf50dc5a167404abbac64124fe53
2021-05-06 07:06:06 +00:00
TreeHugger Robot
50ace76f98 Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

Change-Id: I85e251bc9aa9e42735abbe292ec7c596dfcd74b7
2021-05-06 07:05:54 +00:00
Les Lee
7469890c87 Merge "wifi: Use new API for wifi data usage function" 2021-05-06 06:57:03 +00:00
Yi Jiang
d0af03e11c Merge "Fixes NPE in Screen attention setting" into sc-dev 2021-05-06 06:55:33 +00:00
TreeHugger Robot
b720318fd3 Merge "Fix color filling on some Wifi pages" into sc-dev 2021-05-06 06:54:14 +00:00
TreeHugger Robot
fd32dc93c9 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -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/+/14352145

Change-Id: Ia72b0e0d3827762aed6b92b100d5979df3f130f0
2021-05-06 06:53:25 +00:00
TreeHugger Robot
fdcf96ee99 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -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/+/14352145

Change-Id: Ia495305891c49e3ffee19d7bee3f0107f6085ad3
2021-05-06 06:52:02 +00:00
TreeHugger Robot
dff47cf00a Merge "Fix loading ring overlapping problem" into sc-dev 2021-05-06 06:51:24 +00:00
Mill Chen
efbcc69cc4 Fix inconsist color filling on collapsing toolbar
Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.

Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar

Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
2021-05-06 14:46:30 +08:00
TreeHugger Robot
21ab21168b Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev 2021-05-06 06:30:13 +00:00
TreeHugger Robot
0887761e6f Merge "Update battery settings string" into sc-dev am: 1ae9a706ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: Ide1c356052f491378abef58d84805920674961e8
2021-05-06 06:13:32 +00:00
TreeHugger Robot
565fae6f4b Merge "Update battery settings string" into sc-dev am: 1ae9a706ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: Icf787d0d45c0f859843153f6a290e497c0fbb17c
2021-05-06 06:13:19 +00:00
YUKAI HUNG
7452491629 Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: I1cdb913df2372715a35845efef5b8112886a1e5e
2021-05-06 06:12:58 +00:00
YUKAI HUNG
dd98b47255 Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: I2b6c5ee5c3ef4bdb50091f4d31ed84e0777afafc
2021-05-06 06:12:38 +00:00
TreeHugger Robot
55fda06d50 Merge "Update battery settings string" into sc-dev am: 1ae9a706ff am: 4b3f704b88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: I7c7bae61c520fe8165f3a59e6bb8c8b59f391062
2021-05-06 06:06:26 +00:00
YUKAI HUNG
ae7ff5041c Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea am: db779776cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: Ie4b154dc16f0c43d4d8003af57c68674b877bf72
2021-05-06 06:04:53 +00:00
TreeHugger Robot
4b3f704b88 Merge "Update battery settings string" into sc-dev am: 1ae9a706ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: I493692cab4cd71f50a5c882627763bea9aa93cf5
2021-05-06 05:59:32 +00:00
YUKAI HUNG
db779776cb Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: I9c352b081883ceee9a009c14f1e123fc9ec586d9
2021-05-06 05:59:16 +00:00
TreeHugger Robot
c92abc116c Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe am: 55be0e9053
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I728f1d33af6305e3db3548a97b94b75dde10fbbe
2021-05-06 05:57:44 +00:00
TreeHugger Robot
1ae9a706ff Merge "Update battery settings string" into sc-dev 2021-05-06 05:55:49 +00:00
YUKAI HUNG
b3267fb2ea Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev 2021-05-06 05:54:00 +00:00
TreeHugger Robot
55be0e9053 Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I856463521ea32b2b6bf64b2cb6d11802ec45fd84
2021-05-06 05:52:01 +00:00
TreeHugger Robot
7ed90fe7db Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I21825cc582faf3320115c16579ee77de38ea018e
2021-05-06 05:50:25 +00:00
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
TreeHugger Robot
1f00925c74 Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: Id24b4e7f3a0852e1a85415e6232ed99b318ba3f3
2021-05-06 05:49:10 +00:00
TreeHugger Robot
a75ba398fe Merge "Fix searching condition for biometric settings" into sc-dev 2021-05-06 05:37:08 +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
c982d4581e 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: I4dbf1b5603e80a7f383da2f6bf2a4a5f1ddb04b2
2021-05-06 05:27:31 +00:00
TreeHugger Robot
a8b3277b18 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: I4e147e373c327911bb9a6d9b945855c4f4b454f2
2021-05-06 05:27:23 +00:00
Jason Hsu
1b23d619b8 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: I294102407ed1ee0dae97e4485b454a1b44c80f5e
2021-05-06 05:27:13 +00:00
TreeHugger Robot
cb07496c14 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: I2db1d3c880208cee5852c987c8edfdd6a5908a36
2021-05-06 05:26:58 +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
67b79fe9f5 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: Id679cd941f052b587f3efb26c1e11787ee58d050
2021-05-06 03:52:02 +00:00
Les Lee
ab3528dc86 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: Iaf7e07ae15cffcef51b8621f6512e68f7eb5f409
2021-05-06 03:51:06 +00:00
ykhung
953b7e3bf5 Add abnormal interpolation info to log unexpected conditions
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I11156c85b6b955dd505b41a9a41be0756638f1dd
2021-05-06 11:48:20 +08:00