Yi Jiang
1fd1217020
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
am: b286fb2897
am: fe4c8e7e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: Idd538f1a172a64fe4b55ead1884b95522e47de5f
2021-05-21 17:45:32 +00:00
TreeHugger Robot
b9ff4f7c97
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
am: f23959cf91
am: 2b65bf65fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: I78bc636af5b80c1a309d03646c9073c8830c4a67
2021-05-21 17:45:25 +00:00
Yi Jiang
5f61029fdb
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
am: f1ceff4995
am: 16ceee3678
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: I02f2eecb7e89c30ffd509cf1710f1cfacca66af5
2021-05-21 17:43:04 +00:00
Quang Luong
1f3c9c1295
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d
am: 4921f2fd3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: I2993de0456044f28ca91dfeca27871d7392392ab
2021-05-21 17:26:47 +00:00
Quang Luong
1af183e8a7
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d
am: bc39d7bd0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: If6c7354ca90078d39f2e4dab9ff12905df748354
2021-05-21 17:20:07 +00:00
TreeHugger Robot
fcb9894295
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
am: 61ea520982
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: Ibb285ff4b9460525321c3bc9c6e4f84b58f61984
2021-05-21 17:19:42 +00:00
Quang Luong
bc39d7bd0b
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: Ic86c48d54aa589581b8cacaf7b0cf1be91604742
2021-05-21 17:19:29 +00:00
Yi Jiang
fe4c8e7e5a
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
am: b286fb2897
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: I50b4adb62b1138a14ef56c69d0fa3c479d6633b9
2021-05-21 17:19:24 +00:00
Quang Luong
4921f2fd3c
Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881
Change-Id: I76d5a1615b3158dc11c84be61360f8609033f45d
2021-05-21 17:19:05 +00:00
TreeHugger Robot
2b65bf65fe
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
am: f23959cf91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: Id543559bb53f3744e96509ded3d8dfe490c0409c
2021-05-21 17:17:44 +00:00
Yi Jiang
16ceee3678
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
am: f1ceff4995
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: Iaf8fad78aa18af63a9b0672b861796e2aeb507d6
2021-05-21 17:17:12 +00:00
TreeHugger Robot
61ea520982
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: Ie926569098177c743a6510982df03077aa36d619
2021-05-21 17:17:03 +00:00
Quang Luong
ae59885f3d
Merge "Refresh security pref in Network Details page" into sc-dev
2021-05-21 17:14:35 +00:00
TreeHugger Robot
f23959cf91
Merge "Fix the color of dot wrongly in device admin page" into sc-dev am: 48fab1db3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663076
Change-Id: I0252c41e823d569d2cfbabd550cb87a07bf0c126
2021-05-21 17:11:25 +00:00
TreeHugger Robot
48fab1db3a
Merge "Fix the color of dot wrongly in device admin page" into sc-dev
2021-05-21 17:05:30 +00:00
Yi Jiang
f1ceff4995
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: I65f6f9aa7117c9b6e9e15c81300605d2af9cc58a
2021-05-21 17:03:38 +00:00
Yi Jiang
b286fb2897
Merge "Defers initialization of preferences." into sc-dev am: f1d1765e38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14647779
Change-Id: Ifc1dcab14ade4d17e276a39377dd41fc64ab854b
2021-05-21 17:01:20 +00:00
Yi Jiang
f1d1765e38
Merge "Defers initialization of preferences." into sc-dev
2021-05-21 16:41:10 +00:00
YUKAI HUNG
849927af43
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
am: 1cc84dce86
am: 3a3ad1218c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: Ib237f59e66abd779e799405745459778a67c9d36
2021-05-21 13:56:01 +00:00
YUKAI HUNG
927456155b
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
am: 6b9883b8a3
am: 5027dcac36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: I817b2287deeae761681cc9c4e164675f8d22c854
2021-05-21 13:55:46 +00:00
YUKAI HUNG
3a3ad1218c
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
am: 1cc84dce86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: Ic4baf77bfa4fc9988fda839ae98c9b9b0e6b6c58
2021-05-21 13:42:27 +00:00
YUKAI HUNG
5027dcac36
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
am: 6b9883b8a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: I11b90e65216ad05341116744172e8a52ad8e5bc3
2021-05-21 13:41:25 +00:00
YUKAI HUNG
6b9883b8a3
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: Ia28b783c3411cf9e7c8595b67a4dc665d81a2d4d
2021-05-21 13:27:57 +00:00
YUKAI HUNG
1cc84dce86
Merge "Fix footer preference may flash one time when entering" into sc-dev am: 8033a6ff20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14675093
Change-Id: I6d57b94f683f35f4f09fb1f840544c4076764b06
2021-05-21 13:24:41 +00:00
Yanting Yang
0bc49326ee
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
am: 191dce0af0
am: a602d62c50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: I329295b07560ae0cfac5d511104d568788608b47
2021-05-21 13:16:51 +00:00
Yanting Yang
6c28d1a6f1
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
am: dca2e6903c
am: 807289d6ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: I8b67bf064171fcc95263cb00ed1ccfa91b522def
2021-05-21 13:16:42 +00:00
YUKAI HUNG
8033a6ff20
Merge "Fix footer preference may flash one time when entering" into sc-dev
2021-05-21 13:04:11 +00:00
Yanting Yang
a602d62c50
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
am: 191dce0af0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: I36e915b5e245b01bdd7ba9fa004d5b6270554775
2021-05-21 13:01:40 +00:00
Yanting Yang
807289d6ce
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
am: dca2e6903c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: Ida85fc2d9d46810efd5f22ddc24df8d962343d20
2021-05-21 12:58:55 +00:00
Yanting Yang
dca2e6903c
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: I0475178927954303bfb15638d91b4db54060106a
2021-05-21 12:44:00 +00:00
Yanting Yang
191dce0af0
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14452997
Change-Id: I6c8cc6fbfcac9156279f472803542ae915aebe7a
2021-05-21 12:42:06 +00:00
Yanting Yang
5b6cb52c50
Merge "Introduce InteractionJankMonitor into Settings" into sc-dev
2021-05-21 12:26:41 +00:00
TreeHugger Robot
74b862f2ce
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
am: c964e1ff0d
am: e17dbdc46e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: I6f7e7af7f34bd6ebdf288f452b0004695ca99cc6
2021-05-21 10:30:22 +00:00
TreeHugger Robot
2fe6f5e8ea
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
am: afe0ff787d
am: eeb1269983
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: I45a752f81ffab8b50513aa4c13516634d8f4ae83
2021-05-21 10:29:36 +00:00
TreeHugger Robot
e17dbdc46e
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
am: c964e1ff0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: Ibdcbdc30374700d32358e58f4bbd4616ac6b6b63
2021-05-21 10:16:42 +00:00
TreeHugger Robot
eeb1269983
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
am: afe0ff787d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: Id29c6d6d8d7a6f247afd46fdc624a503282fc4c2
2021-05-21 10:15:14 +00:00
TreeHugger Robot
afe0ff787d
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: Ia5e72969e61f8af560a2617579386bd031891bbe
2021-05-21 10:00:14 +00:00
TreeHugger Robot
c964e1ff0d
Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271
Change-Id: I4a9d100a2c4bee2ecaceb3865963ac5a5ff51099
2021-05-21 09:57:34 +00:00
ykhung
e030d8613a
Fix footer preference may flash one time when entering
...
new solution > We will not show the footer preference in the beginning when users entering the app, it will wait until the data is loaded to show the footer and app item in the same time. We also enhance the footer message as "Battery usage data will be available after you use your phone for a few hours" when there are not content in the begining.
Bug: 187766862
Bug: 188871770
Test: make SettingsRoboTests
Change-Id: I8d19173b4402722797b1ae3c4cfe6dcdf2d3fe3f
2021-05-21 09:50:43 +00:00
TreeHugger Robot
417af889e1
Merge "Fix overlapping problem for device admin page" into sc-dev
2021-05-21 09:42:05 +00:00
changbetty
8267a2757f
Remove the Network rating provider item
...
Bug: 187119482
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Iff4a7663c0bca8f0553fcd16673a9aa766050ff4
2021-05-21 17:08:44 +08:00
TreeHugger Robot
21d1a9d2a5
[automerger skipped] Merge "Make preference title align after icon" into sc-dev am: d573f1d19e
am: fd54b6254d
-s ours am: 4d687af52f
-s ours
...
am skip reason: Merged-In Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad with SHA-1 600d023892
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997
Change-Id: I7b5560c577b92f01068912540868d9c78539a4c7
2021-05-21 09:01:21 +00:00
Weng Su
6f0db91727
Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1
am: 9cce69a6e8
am: a4821a4fdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867
Change-Id: I0b88943831c298cfe80a4e1d51b703e2edd63e9e
2021-05-21 09:01:09 +00:00
TreeHugger Robot
6901a24c3c
Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59
am: fecce407a2
am: bd2949eacf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077
Change-Id: I6f6586b62a8347b362fa4550c1c46f789c1defa0
2021-05-21 09:00:32 +00:00
TreeHugger Robot
a27d5e7e6a
[automerger skipped] Merge "Make preference title align after icon" into sc-dev am: d573f1d19e
am: ee1f633cf0
am: fe8f4b24cc
-s ours
...
am skip reason: Merged-In Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad with SHA-1 69cc5377f1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997
Change-Id: Icdc6281b9c805b75d61804f23d39555da09e50a3
2021-05-21 09:00:21 +00:00
Weng Su
1ad9482d73
Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1
am: ab2394c773
am: 6598c5f26a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867
Change-Id: Icf019ac0a23418f4225a62a3c1b3fe5933912a8c
2021-05-21 08:59:15 +00:00
TreeHugger Robot
284f9fa3a2
Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59
am: d66f004a86
am: 6fba19fbf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077
Change-Id: I2695da656b4838c58ec7dd43c4ea57d0e107a197
2021-05-21 08:59:04 +00:00
TreeHugger Robot
4d687af52f
[automerger skipped] Merge "Make preference title align after icon" into sc-dev am: d573f1d19e
am: fd54b6254d
-s ours
...
am skip reason: Merged-In Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad with SHA-1 600d023892
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997
Change-Id: I4a24d9dfef73b2b2131e780d50e902e7a5d6bcd0
2021-05-21 08:47:18 +00:00
Weng Su
a4821a4fdd
Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1
am: 9cce69a6e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867
Change-Id: I8eee744969d25700f83f25f73f23ee033ce8db7f
2021-05-21 08:46:52 +00:00
TreeHugger Robot
bd2949eacf
Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59
am: fecce407a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077
Change-Id: I7d27e3c91afbff65a6f562f0d01f98615d961706
2021-05-21 08:46:47 +00:00