Commit Graph

61791 Commits

Author SHA1 Message Date
TreeHugger Robot
82b3f21f10 Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f am: c8e6f9a025
Change-Id: I39fed89038b2ed4dc1309da8c3f6c6fc70c46f1e
2020-05-18 23:21:53 +00:00
TreeHugger Robot
c8e6f9a025 Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f
Change-Id: I4fe97b374c812dbfce90131c351dd1637789da03
2020-05-18 23:11:17 +00:00
TreeHugger Robot
45910eec3f Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev 2020-05-16 01:09:07 +00:00
TreeHugger Robot
f91d67428e Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a
Change-Id: I91d8d64f0c4ffebf2b7a04da00dd391bd0aa58b9
2020-05-15 23:44:34 +00:00
TreeHugger Robot
d127bdc14a Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea
Change-Id: I18305781e02f5c14c5c2b192e922d0294420cbf9
2020-05-15 23:38:24 +00:00
TreeHugger Robot
4bbe564aea Merge changes from topic "jr-update" into rvc-dev
* changes:
  Update conversation launch point
  Add settings for apps that don't use full conversations
2020-05-15 23:35:06 +00:00
TreeHugger Robot
10ab1e1e8b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours
am skip reason: subject contains skip directive

Change-Id: Ia85b67e00108440d4e5f5cefee08f85daddf23a2
2020-05-15 23:32:53 +00:00
TreeHugger Robot
0736ea6e03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours
am skip reason: subject contains skip directive

Change-Id: I201eb0bcaf8e23ff57a393b6cebb84447832f714
2020-05-15 23:32:41 +00:00
TreeHugger Robot
30738191dc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf3b226075a48d1768917f411753ae8f00b3d1f0
2020-05-15 23:25:51 +00:00
TreeHugger Robot
a264157438 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-15 23:21:28 +00:00
TreeHugger Robot
753c885c08 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4c632199a55c066c9ae45b82fe9ed28233c5227
2020-05-15 23:19:37 +00:00
TreeHugger Robot
a9ef11f243 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-15 23:05:04 +00:00
TreeHugger Robot
3845234a31 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours
am skip reason: subject contains skip directive

Change-Id: I78cc0de8eb4c709c7bb152be2f98c2967439243c
2020-05-15 22:31:29 +00:00
TreeHugger Robot
7b104cf937 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours
am skip reason: subject contains skip directive

Change-Id: I57370de051c5d2fbe051e4c7f2faacea907624b9
2020-05-15 22:30:46 +00:00
TreeHugger Robot
aa76705149 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-15 22:26:30 +00:00
TreeHugger Robot
f94e4f739e Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-15 22:14:41 +00:00
TreeHugger Robot
c51e9b5864 [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: Ic3115f588e544915f955227e48608d02a4036ee2
2020-05-15 22:05:22 +00:00
Bill Yi
90b6c14fd6 [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: I85abce567222922e5b4c916ef34a95a207f62463
2020-05-15 22:03:56 +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
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
Julia Reynolds
cd237ccf9b Update conversation launch point
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 156670585
Change-Id: I31f306d1b7d480ac0ef0cc4a5f7e66efe528383d
2020-05-15 19:40:56 +00:00
Julia Reynolds
eca1e4d197 Add settings for apps that don't use full conversations
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 155276427
Change-Id: Ie145b9cdc9555d4676a8bd225427abc9222f31c5
2020-05-15 19:38:14 +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
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
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
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
Bill Yi
25ded66fd5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4de82667221da47f7f0b197337665d1f0aa81420
2020-05-14 20:29:54 -07: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
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
Bill Yi
52508c5ba4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I27989a7173630bea35b9c3a799e2502475a22744
2020-05-14 19:45:37 -07: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
72638462e1 Merge "Display previous active media information" into rvc-dev 2020-05-15 02:10:54 +00:00
Bill Yi
c3a32d92d7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I195e9df86959b2be7ae5acb097fa62fb152d8bff
2020-05-14 19:03:03 -07:00
Bill Yi
7a917b74a8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I9aa331208b21992c33ec194e32624494bfe98f2a
2020-05-14 18:20:16 -07:00
Jay Aliomer
ed7092de24 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c
Change-Id: I02fbf42378a0552c99cef09ad1338dc2caac5e78
2020-05-15 00:29:22 +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
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
ad332955ba Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488
Change-Id: I09d1e3450adcb2e48a1bb095c5055fa4235bae74
2020-05-14 12:09:14 +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
6170f9372e Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50
Change-Id: I8161c7f90ff8645bc9ab83bc91296597fc59803e
2020-05-14 08:11:11 +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
Jason Chiu
60071b9287 Merge "Add metrics log for special cases" into rvc-dev 2020-05-14 07:12:47 +00:00