Commit Graph

69165 Commits

Author SHA1 Message Date
Automerger Merge Worker
ec28e4e674 Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp am: dc6d6624ba
Change-Id: Ia919586571ea06e7776a0911b520f85f6192aff7
2020-05-15 12:54:32 +00:00
Yanting Yang
f28b7d3bbc Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f am: 360fdd8886
Change-Id: I238d957b0980000598efa6a58e0a4f2bb36116a5
2020-05-15 12:54:13 +00:00
Yanting Yang
838957c0f9 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433
Change-Id: Ia51c13206f46b78aa7f23a86eb80683cc03d8af2
2020-05-15 12:53:51 +00:00
Automerger Merge Worker
dc6d6624ba Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp 2020-05-15 12:31:46 +00:00
Yanting Yang
3fee8e0c8f Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88
Change-Id: I17b96ff3b0cb78823bea64d709e41e56c50fe16c
2020-05-15 12:31:41 +00:00
Yanting Yang
360fdd8886 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f
Change-Id: I8bdcb7e50dd65f57870eef048519624bdb49aad5
2020-05-15 12:31:37 +00:00
Yanting Yang
fa064bf433 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064
Change-Id: Ie94785c96d827bd401c5cfc01e420770eed36f60
2020-05-15 12:31:26 +00:00
Yanting Yang
2b8702ad88 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5
Change-Id: If84a87337bb5ecd5d8380111415188cc2a99cd54
2020-05-15 12:14:06 +00:00
Yanting Yang
b30ae28c9f Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715
Change-Id: I22020bae8d96593a3944745b3bde5448c2638aef
2020-05-15 12:13:56 +00:00
Yanting Yang
8a20f65064 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715
Change-Id: Ifd6e80cd31be4654f250d040c43b133157d5a865
2020-05-15 12:13:32 +00:00
Yanting Yang
8b3c7b20b5 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7
Change-Id: If322e9049dc828a406533694cd2062f4fe6456ac
2020-05-15 12:01:28 +00:00
Yanting Yang
b9104da715 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7
Change-Id: I21ed82dc007d52cd0e4d157ca20d07198830fbdc
2020-05-15 12:00:56 +00:00
Treehugger Robot
d0b06f5bee Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985 am: 7f1f96ac92
Change-Id: I7a40ddb61b37c66c5d621ace1b0a651398a108ef
2020-05-15 11:52:14 +00:00
Yanting Yang
5812014ff7 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev 2020-05-15 11:44:20 +00:00
Treehugger Robot
7f1f96ac92 Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985
Change-Id: I2626f40f54a84bed005cc0c5568c9e9b7776e990
2020-05-15 11:40:29 +00:00
Treehugger Robot
a4bc83b985 Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7
Change-Id: I50203efaf62eb49dec858314befe635cd2f1c030
2020-05-15 11:14:13 +00:00
Treehugger Robot
f4383db1b7 Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6
Change-Id: I84c0d95de3f1cc108197cc3f8ab88a9a1d08b0bc
2020-05-15 10:57:57 +00:00
Treehugger Robot
5797829fa6 Merge "Settings performance testing" am: 9446266f4f
Change-Id: Ie761e966d27c4aaf7e28850b0a01fc06650c4738
2020-05-15 10:43:29 +00:00
Treehugger Robot
9446266f4f Merge "Settings performance testing" 2020-05-15 10:28:54 +00:00
youtengliang
1bf3f1c26a Settings performance testing
1. Change TEST_TIME to 10 to avoid timeout fail.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: Id1ec855196b3e8b5fdd28c0d683aa95b002a8462
2020-05-15 14:26:14 +08:00
Automerger Merge Worker
fd10e640b9 Merge "Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672" into rvc-qpr-dev-plus-aosp am: 13fda9098e
Change-Id: I8cc99b168aff5ecc37c9758d25e4f59c1d052636
2020-05-15 04:09:51 +00:00
tim peng
ca7f6d053a Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9 am: 8913b46ff5 am: 2ad13b6ad6
Change-Id: Ifcdbeb620293afd0a84b4e337710c0aa09ef1e28
2020-05-15 04:09:27 +00:00
tim peng
71972d0d54 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 7c834b43dc am: 2e9f24c131
Change-Id: Ia5200dc1bf0c5fd175bae2235709ffaa4e7ef6ca
2020-05-15 04:08:51 +00:00
Automerger Merge Worker
13fda9098e Merge "Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672" into rvc-qpr-dev-plus-aosp 2020-05-15 03:50:56 +00:00
tim peng
5c217c8208 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672
Change-Id: If02ab431efd362db7adbb70abe5aac77edfc23ab
2020-05-15 03:50:46 +00:00
tim peng
2ad13b6ad6 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9 am: 8913b46ff5
Change-Id: I7776b58202c63e6200edba089d07c7c0448dd9e9
2020-05-15 03:50:45 +00:00
tim peng
2e9f24c131 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 7c834b43dc
Change-Id: Ie41ec89197ad37f3f95a54ee78acfbc99dfb0ca3
2020-05-15 03:50:21 +00:00
tim peng
0311911672 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212
Change-Id: I4048a2543c12b3e3567a8b79129653c11809c968
2020-05-15 03:33:41 +00:00
tim peng
8913b46ff5 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9
Change-Id: Id8a0a41f34ef140941ad8af0931f6c1396cec732
2020-05-15 03:33:41 +00:00
tim peng
7c834b43dc Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212
Change-Id: Ie2ece21e9907a8582e96b1b8a921780fa70b892d
2020-05-15 03:33:15 +00:00
tim peng
3fe52bfe4e Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 0bb6fa1f2e am: f56d85628b
Change-Id: I380de46cdf4da86841be4083ba0307d5e4eae39c
2020-05-15 03:18:33 +00:00
Automerger Merge Worker
63d0cea97e Merge "Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b" into rvc-d1-dev-plus-aosp am: 17a295a69c am: 3abf9019f3
Change-Id: Ibae87bd324ba70bd9875aaf12e55eb56cbbb3280
2020-05-15 03:18:12 +00:00
tim peng
84ed686f8c Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 435d8f80f1 am: af633d3916
Change-Id: I56aa8ac16a9e461a356ea8797853fd1d4f97922e
2020-05-15 03:17:43 +00:00
tim peng
bd75d389e9 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f
Change-Id: I9ab4c04b75fdb9d5bd3f1b5f2ff56c00f744e8fd
2020-05-15 03:17:23 +00:00
tim peng
0eec352212 Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f
Change-Id: If946b5c4db62164b39c8e56c0801e506a1016e69
2020-05-15 03:17:22 +00:00
tim peng
f56d85628b Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 0bb6fa1f2e
Change-Id: I23c25443dc43bdd12f3d85eae25e450a6983641e
2020-05-15 03:05:31 +00:00
Automerger Merge Worker
3abf9019f3 Merge "Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b" into rvc-d1-dev-plus-aosp am: 17a295a69c
Change-Id: If8522318380f7e637401c027618d2b07399043c7
2020-05-15 03:05:02 +00:00
tim peng
764387772f Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev 2020-05-15 03:04:52 +00:00
tim peng
af633d3916 Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 435d8f80f1
Change-Id: Id84b541d0f1a7b4ba55645dde576f498dd22b024
2020-05-15 03:04:40 +00:00
Automerger Merge Worker
17a295a69c Merge "Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b" into rvc-d1-dev-plus-aosp 2020-05-15 02:52:00 +00:00
tim peng
e4ff7aaba5 Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b
Change-Id: I4769ef207da842b6dc161e739e8612c35b6cf54b
2020-05-15 02:51:56 +00:00
tim peng
435d8f80f1 Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5
Change-Id: Ie02ae82be432abf7d6165433950796f5339ae7ac
2020-05-15 02:51:54 +00:00
tim peng
0bb6fa1f2e Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5
Change-Id: I1b7bcda24f1f8928f1a474f574ee36f3a6e05245
2020-05-15 02:51:35 +00:00
tim peng
317f7358e5 Merge "Display previous active media information" into rvc-dev am: 72638462e1
Change-Id: I3f657555614b3f9e3ccdd3563059c1dfc78f3225
2020-05-15 02:34:59 +00:00
tim peng
56ed13a15b Merge "Display previous active media information" into rvc-dev am: 72638462e1
Change-Id: I8f5cabc299a99c27b0b6c68be98cd7d583b8fc95
2020-05-15 02:34:52 +00:00
PETER LIANG
aee3d3e78d Merge "Refine the banner view for accessibility features." 2020-05-15 02:15:00 +00:00
tim peng
72638462e1 Merge "Display previous active media information" into rvc-dev 2020-05-15 02:10:54 +00:00
Jay Aliomer
a19c2e498d Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: b56a6e06cf am: cd8ce49cd9 am: 43a243ccd1
Change-Id: I2fc767df07c43bed534f4efe21542738a832763a
2020-05-15 01:02:18 +00:00
Jay Aliomer
9fa5b6e5d9 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: ed7092de24 am: 1856fad39c
Change-Id: Icad3339c12448584b9abd64e674cf8b8abb52143
2020-05-15 01:00:47 +00:00
Jay Aliomer
e64715b2fb Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: e8451d99a0 am: f719aca99d
Change-Id: I9e3e5fb76ae9256770186c73b8cf5b2717f313af
2020-05-15 00:59:02 +00:00