PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,689 Commits 1 Branch 0 Tags
e5b64442ca464dfc00ff4a57a31a767ca6b5e73f
Commit Graph

63689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e5b64442ca Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours" into rvc-d1-dev-plus-aosp 2020-05-15 22:05:08 +00:00
TreeHugger Robot
14a4df4634 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 10244a3ce0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I14506440b31334d87e2f029e6e596533a5fd7e75
 2020-05-15 22:05:03 +00:00
TreeHugger Robot
2bc446c98b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours am: 489b78cae9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6e9617143d7d85efdd78eba3d3f34e00e1684c06
 2020-05-15 22:04:56 +00:00
Bill Yi
7968c73b5b [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: f9f0ee1539 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie479e750719702bf33a60e5bdc000cbaf60092e0
 2020-05-15 22:04:01 +00:00
Bill Yi
c1567ea37b [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours am: 9b1b0a9c75 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iff980ca90e1e8a5ddc1c5a773f74783af38acf0e
 2020-05-15 22:03:52 +00:00
TreeHugger Robot
489b78cae9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I22a5978bfb41a9ecc027bff2e8986353b7e4b46b
 2020-05-15 21:44:19 +00:00
TreeHugger Robot
10244a3ce0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours am: e002abfb6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I97d476e4022e9b78e43cd5f07a08fd5b7d3bb796
 2020-05-15 21:43:52 +00:00
Bill Yi
f9f0ee1539 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours 
am skip reason: subject contains skip directive

Change-Id: I1d0b0627353a635801a19c8db5e662bea41f50ef
 2020-05-15 21:43:44 +00:00
Bill Yi
9b1b0a9c75 [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours am: 3a86ceebae -s ours 
am skip reason: subject contains skip directive

Change-Id: If32dd964132dfe8d0a8bb826a26734fa07909165
 2020-05-15 21:43:37 +00:00
TreeHugger Robot
e002abfb6c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a -s ours 
am skip reason: subject contains skip directive

Change-Id: I95387650d0f829bb6658ad0700c5d3fdff442595
 2020-05-15 21:26:30 +00:00
Bill Yi
3a86ceebae [automerger skipped] Import translations. DO NOT MERGE am: c1bb4c3045 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie3afdfd7a7e11ebcbe5ae7d699a1fbd4ff5fd3e5
 2020-05-15 21:26:23 +00:00
TreeHugger Robot
8e7fa0958a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-05-15 21:13:40 +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
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
Yanting Yang
5812014ff7 Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev 2020-05-15 11:44:20 +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
Bill Yi
c1bb4c3045 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: If1e3664a49ff6fa6582310eb0b3bc7aa8a620423
 2020-05-14 21:56:56 -07:00
Bill Yi
5f50215f6b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I5f3e159c71ba612729b775ce6e9a43ea56ce5a15
 2020-05-14 21:13:24 -07: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
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
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
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
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
tim peng
72638462e1 Merge "Display previous active media information" into rvc-dev 2020-05-15 02:10:54 +00:00
Jay Aliomer
cd8ce49cd9 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: b56a6e06cf 
Change-Id: Icb81609cd31cb91a0ffa6abc96ca671099704d15
 2020-05-15 00:29:59 +00:00
Jay Aliomer
e8451d99a0 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c 
Change-Id: Ibd035c8749e06a8ee0909ec2342e3ca35819e613
 2020-05-15 00:29:24 +00:00
Jay Aliomer
7bc6358a8c Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 
Change-Id: I690971a567b813ff3bc6a7b96649da986e2fd31b
 2020-05-15 00:17:26 +00:00
Jay Aliomer
b56a6e06cf Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 
Change-Id: I7e9c33644e76e7712d0becfdacfdbf1cfdd26b83
 2020-05-15 00:17:16 +00:00
Jay Aliomer
dba11e82b5 Revert "Revert "Unable to select twilight scheduling after enabling location"" 
This reverts commit 782438347b.
Bug: 153115261
Reason for revert: fixing tests

Change-Id: I497a2b83cbe3eaee5f5fb3eb4df73618130fc6e2
 2020-05-14 15:14:18 +00:00
TreeHugger Robot
fabd02d872 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 565cc81e97 
Change-Id: Iac8ea0eaa2c95d9cd172517b80cfba6b03140f63
 2020-05-14 12:09:18 +00:00
TreeHugger Robot
bd39e9feb5 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 
Change-Id: I03bde42780aeddc367ca7cc1e4b231c66e8611c7
 2020-05-14 12:09:00 +00:00
TreeHugger Robot
565cc81e97 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 
Change-Id: I8c6e49c40d6d005096b4f8430d3411679246b779
 2020-05-14 11:55:45 +00:00
TreeHugger Robot
722b197488 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 
Change-Id: I28fd7a76774639806b79d9ffd7a5b9272dd96bfa
 2020-05-14 11:55:36 +00:00
TreeHugger Robot
fa1e102af7 Merge "Do not prebind sticky slices." into rvc-dev 2020-05-14 11:37:45 +00:00
Jason Chiu
997aa1dffa Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0 
Change-Id: I8a7d1abdd6b270269ea26e26c996e7e3c3ad816d
 2020-05-14 08:10:26 +00:00
Jason Chiu
68335164e1 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 
Change-Id: I5204e67ae2f85a6590d87d721481bf6bc5f39241
 2020-05-14 08:10:12 +00:00
Jason Chiu
a69f270ac0 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 
Change-Id: I95e4190ee4492a892e11d65d413db2443c975c8d
 2020-05-14 07:29:02 +00:00
Jason Chiu
f067ac4f50 Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 
Change-Id: I6fcbbcb9b1dddfcd2114cfd81ee225bad0fc7e9f
 2020-05-14 07:28:56 +00:00
Tim Peng
493e1a62c8 In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list 
-The group view should not be clickable
-Disable view clickable flag

Bug: 151126466
Test: make -j50 RunSettingsRoboTests
Change-Id: Ia617f436a615168d422d208959db5513b38e6564
 2020-05-14 15:19:39 +08:00