Bill Yi
58957af851
Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
...
Merged-In: I1da09579d5ce7b2c67b4a7db381c779a5c5ccb6b
Change-Id: Ifdb33d0e12e1a487f694c37e3e99f87af06b6b74
2020-05-05 17:02:32 +00:00
Bonian Chen
464179cee9
Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
am: 646b02e4d6
...
Change-Id: I43973671bc9f81e6bc82537b53498c959c983300
2020-05-05 16:28:46 +00:00
Bonian Chen
2be95c9322
Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
am: 441d085d94
...
Change-Id: I26022c264454ee6bf961a25bc8d3021dccc218c0
2020-05-05 16:28:29 +00:00
Bonian Chen
646b02e4d6
Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
...
Change-Id: Icd6e9fd789f1ce9031d3171e238411e8978884c0
2020-05-05 16:12:52 +00:00
Bonian Chen
441d085d94
Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
...
Change-Id: I0e5602e0ad69b980cde0de231d30bb77595637d6
2020-05-05 16:12:38 +00:00
Bonian Chen
1de5f2e799
Merge "[Settings] Code refactor" into rvc-dev
2020-05-05 15:45:13 +00:00
TreeHugger Robot
2feb180858
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d
-s ours am: fedb9cff53
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I683b96a1502c92690e4ed6173da294dbaacabc29
2020-05-05 14:35:45 +00:00
TreeHugger Robot
496b6483f3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c
-s ours am: 56796cca75
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I66c2f6ff2b3bd81f18e655b76b536a259a251008
2020-05-05 14:35:34 +00:00
TreeHugger Robot
0172a6a90a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d
-s ours am: 4e64839ae5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifa8aec900df521f1d420dcca06de4dc413642c8f
2020-05-05 14:34:39 +00:00
TreeHugger Robot
cd4288a32d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c
-s ours am: 7dc92e1f5e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3cbf99226fdf9ec820957553290babb24cf80a77
2020-05-05 14:34:30 +00:00
TreeHugger Robot
fedb9cff53
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8f2e506dab383f0cb074475ea7856f22d8c6ba09
2020-05-05 14:22:48 +00:00
TreeHugger Robot
4e64839ae5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibff6f24cb2287781a3045ca577150300b5d4736e
2020-05-05 14:22:42 +00:00
TreeHugger Robot
56796cca75
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5c7d6e2437356b2a81e01201787898a407513ef9
2020-05-05 14:22:41 +00:00
TreeHugger Robot
7dc92e1f5e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iecdc1a3e3810e15f85f21e7fa1e7ab54ad713c09
2020-05-05 14:22:10 +00:00
TreeHugger Robot
47883ee75d
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-05 14:12:46 +00:00
TreeHugger Robot
5c956f5b3c
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-05 14:08:54 +00:00
TreeHugger Robot
d05a30c5d6
Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd
am: 80bb9f5bf6
...
Change-Id: I3725759dcc981aca3f2176164f35fb29fdca7898
2020-05-05 13:31:20 +00:00
TreeHugger Robot
04ce41bf31
Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd
am: 3308f6b52d
...
Change-Id: I9414ac57d6bc11f1f34e16b8c0b5e862329a0f28
2020-05-05 13:31:04 +00:00
TreeHugger Robot
80bb9f5bf6
Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd
...
Change-Id: Icbf097e9c0b0589808034d28ac5cd699245f7aa7
2020-05-05 13:18:18 +00:00
TreeHugger Robot
3308f6b52d
Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd
...
Change-Id: Icbc1f1bfeddb0319a74d9638ae8e8caa865b9d13
2020-05-05 13:18:07 +00:00
Tsung-Mao Fang
ae9dc54c56
Remove duplicate result for dark mode
...
We only keep the one in display settings.
Test: robo test and search dark mode in settings search.
Fix: 155735315
Change-Id: I71041f473944e854ef4601063658021bb9411069
2020-05-05 21:08:37 +08:00
TreeHugger Robot
2e4e4ed1fd
Merge "Replace banner video with static image for Color Inversion." into rvc-dev
2020-05-05 13:07:30 +00:00
TreeHugger Robot
67f3f5fe06
Merge "Remove Connect/Disconnect button dependence on WifiEntry.isExpired()" into rvc-dev am: 02e712ce42
am: ea3269b447
...
Change-Id: I1ab869ef6b18808fdf344163cd155dfa2fb8bb4e
2020-05-05 13:00:18 +00:00
TreeHugger Robot
c3bfc71a4c
Merge "Remove Connect/Disconnect button dependence on WifiEntry.isExpired()" into rvc-dev am: 02e712ce42
am: e29f8d838d
...
Change-Id: Ie752776e416a97f432ba0960d49b43de6752cbcc
2020-05-05 13:00:01 +00:00
TreeHugger Robot
ea3269b447
Merge "Remove Connect/Disconnect button dependence on WifiEntry.isExpired()" into rvc-dev am: 02e712ce42
...
Change-Id: Ide61c82721ef730941c57742c451297b0fc88fea
2020-05-05 12:49:16 +00:00
TreeHugger Robot
e29f8d838d
Merge "Remove Connect/Disconnect button dependence on WifiEntry.isExpired()" into rvc-dev am: 02e712ce42
...
Change-Id: I8058bf54fa1785ef31cc9e219e5a985267ced68a
2020-05-05 12:49:05 +00:00
Andras Kloczl
d19dc306dd
Improve multi user settings screen
...
- Added switch and user delete functionality to details screen.
- Added robo tests.
Screenshots: http://shortn/_S6fbIMhAYO
Bug: 142798722
Test: Run robo tests with this command:
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.*SettingsTest"
Change-Id: Id51c12c5470e30e2dffe93f3bd8c22380d8bdc1f
2020-05-05 13:45:01 +01:00
TreeHugger Robot
02e712ce42
Merge "Remove Connect/Disconnect button dependence on WifiEntry.isExpired()" into rvc-dev
2020-05-05 12:33:28 +00:00
Peter_Liang
5b957476be
Replace banner video with static image for Color Inversion.
...
Bug: 152466128
Test: manual test
Change-Id: I859052385930b01929cad8dbf231d212a9507453
2020-05-05 19:46:08 +08:00
Automerger Merge Worker
e5cf768584
Merge "Merge "Reload homepage cards when necessary" into rvc-dev am: 2e5da48c7f
am: a5c46b55db" into rvc-d1-dev-plus-aosp
2020-05-05 10:30:36 +00:00
Jason Chiu
be038419cc
Merge "Reload homepage cards when necessary" into rvc-dev am: 2e5da48c7f
am: a5c46b55db
...
Change-Id: Iadd7a113bcf4864b306c82e4d9419b402fb3d1a9
2020-05-05 10:30:32 +00:00
Jason Chiu
d7d22b4a74
Merge "Reload homepage cards when necessary" into rvc-dev am: 2e5da48c7f
am: fcbcc763bf
...
Change-Id: I20a4d8e5157f5d7200915f23288698506f34cde8
2020-05-05 10:30:30 +00:00
Jason Chiu
fcbcc763bf
Merge "Reload homepage cards when necessary" into rvc-dev am: 2e5da48c7f
...
Change-Id: I495ca07bf092cbb51127a9eee63951302cb0434a
2020-05-05 10:17:28 +00:00
Jason Chiu
a5c46b55db
Merge "Reload homepage cards when necessary" into rvc-dev am: 2e5da48c7f
...
Change-Id: I2219e99b4391f1c002b6d2448492cb9c0e4727cd
2020-05-05 10:17:23 +00:00
Jason Chiu
2e5da48c7f
Merge "Reload homepage cards when necessary" into rvc-dev
2020-05-05 10:04:09 +00:00
Jason Chiu
e0327ee583
Reload homepage cards when necessary
...
Many users leave Settings app by pressing Home key, but Settings remains
in the same card status and doesn't update when users come back, which
may lead to a bad UX.
This change reloads cards and resets the UI session for some events,
including home key, recent app key, and screen off.
Fixes: 151789260
Test: robotest
Change-Id: Idb575cef4a58894984cb42238d7b3b43c49389a3
2020-05-05 10:03:49 +00:00
Bonian Chen
0065f2e460
[Settings] Code refactor
...
Code refactor.
Bug: 141833767
Test: manual
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-05 10:01:09 +00:00
TreeHugger Robot
e45114d78d
Merge "Enable some settings pages to use paralleled-loading method" into rvc-dev am: 18490b2dc8
am: 2fb7f3e5bb
...
Change-Id: Ia73e55330a0c40ddc8b4460f8d95d8dc8fc67649
2020-05-05 09:50:28 +00:00
TreeHugger Robot
acb2927e8c
Merge "Enable some settings pages to use paralleled-loading method" into rvc-dev am: 18490b2dc8
am: 0f9bc18c74
...
Change-Id: Id95a02eaedc9a7ece88a729fa4998973b806d05c
2020-05-05 09:48:11 +00:00
TreeHugger Robot
0f9bc18c74
Merge "Enable some settings pages to use paralleled-loading method" into rvc-dev am: 18490b2dc8
...
Change-Id: I8a9a225a069442e84fa73d8c75c6c6033b3d3934
2020-05-05 09:34:16 +00:00
TreeHugger Robot
2fb7f3e5bb
Merge "Enable some settings pages to use paralleled-loading method" into rvc-dev am: 18490b2dc8
...
Change-Id: I7bd50f81b088c8dc1ffcf92e23dc8be06e1d0f8e
2020-05-05 09:34:13 +00:00
TreeHugger Robot
18490b2dc8
Merge "Enable some settings pages to use paralleled-loading method" into rvc-dev
2020-05-05 09:23:13 +00:00
Bonian Chen
9a4480d887
Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45
am: 0c7bad635f
...
Change-Id: If85a10949d2305605d7f822c2d6b408d9686eee1
2020-05-05 08:54:04 +00:00
Bonian Chen
0c75f45f12
Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45
am: d36b2bb72d
...
Change-Id: I73e7a82313d5d1db9c8394ac92576cee8ba07a69
2020-05-05 08:43:40 +00:00
Treehugger Robot
0967dd4915
Merge "Settings: Hide carrier settings version if empty" am: 04b1e2415c
am: 72f8fa1c90
am: 703989060f
...
Change-Id: I50dc0e67de3897ffc1eb815f4419809ba456c765
2020-05-05 08:43:32 +00:00
Bonian Chen
d36b2bb72d
Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45
...
Change-Id: I9be77fe1909f88a43eabb876f5de8e2010354015
2020-05-05 08:43:09 +00:00
Bonian Chen
0c7bad635f
Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45
...
Change-Id: I69b1c5bbe9efb305e6a23d7c9e0765618d449fc9
2020-05-05 08:43:01 +00:00
Bonian Chen
cdab906c45
Merge "[Settings] Refactor for performance" into rvc-dev
2020-05-05 08:34:01 +00:00
Treehugger Robot
703989060f
Merge "Settings: Hide carrier settings version if empty" am: 04b1e2415c
am: 72f8fa1c90
...
Change-Id: If9a837c99d37164ce48678d166f20d1821a31fdf
2020-05-05 08:30:54 +00:00
Treehugger Robot
72f8fa1c90
Merge "Settings: Hide carrier settings version if empty" am: 04b1e2415c
...
Change-Id: I5ed35dc059aae3c9d13f9fe02f7106ca075cf112
2020-05-05 08:15:36 +00:00