Automerger Merge Worker
e76e43f29c
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
am: 84f730c4c6
...
Change-Id: I740cdaa5f5852fcb370cf96764de3f1a1e19f318
2020-03-09 13:43:35 +00:00
Automerger Merge Worker
606474fb18
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
am: b28ffa4fe2
...
Change-Id: I479946bb01490d66f95b5d9585b04523d35a3ebb
2020-03-09 13:43:06 +00:00
Automerger Merge Worker
b28ffa4fe2
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
...
Change-Id: I73e48e5b1bf69469aca1d0d47ba0f32a8129888d
2020-03-09 13:26:45 +00:00
Automerger Merge Worker
84f730c4c6
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
...
Change-Id: I5868df45a8ca4741e0d4d789d78991088f2627a1
2020-03-09 13:26:38 +00:00
TreeHugger Robot
5d6c309d65
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev
2020-03-09 13:09:31 +00:00
Automerger Merge Worker
855f7a3924
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
am: eb590720a9
...
Change-Id: I977b549730b0aa38dfbf95f32037f818a9227a8e
2020-03-09 12:49:18 +00:00
Automerger Merge Worker
cd764217aa
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
am: 5e1159a21b
...
Change-Id: If60573a1b98cd52c3289a3f9db4e42d74d64d162
2020-03-09 12:49:01 +00:00
Automerger Merge Worker
eb590720a9
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
...
Change-Id: Id6e67b1f3d59890ca9c9f2ac93783fe0a199084d
2020-03-09 12:30:22 +00:00
Automerger Merge Worker
5e1159a21b
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
...
Change-Id: I476fd4bc7d5d2087a3ae42af3fdceea5a653a728
2020-03-09 12:30:11 +00:00
TreeHugger Robot
e547a87055
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev
2020-03-09 12:19:08 +00:00
Automerger Merge Worker
a6d6cc06ec
[automerger skipped] Merge "Fix PlatformCompatDashboardTest." am: 805f137935
am: 976f7bfe78
-s ours am: 5208d31a72
-s ours
...
am skip reason: Change-Id I833669f7f2a5128bdeda7451b8ff6e0bb753c500 with SHA-1 76f93fe912
is in history
Change-Id: I238f8d69b70d3d452900cb4c98d80778a87ae406
2020-03-09 11:23:39 +00:00
Automerger Merge Worker
5208d31a72
[automerger skipped] Merge "Fix PlatformCompatDashboardTest." am: 805f137935
am: 976f7bfe78
-s ours
...
am skip reason: Change-Id I833669f7f2a5128bdeda7451b8ff6e0bb753c500 with SHA-1 76f93fe912
is in history
Change-Id: I733f27d8c6b7cdb304505979890165fb35cfe51d
2020-03-09 11:17:32 +00:00
Automerger Merge Worker
976f7bfe78
Merge "Fix PlatformCompatDashboardTest." am: 805f137935
...
Change-Id: Idc37972c9db03c70ce537951e983009e22f15476
2020-03-09 11:05:26 +00:00
Anna Trostanetski
805f137935
Merge "Fix PlatformCompatDashboardTest."
2020-03-09 10:53:02 +00:00
Yi-Ling Chuang
40e8c1523b
Fix WirelessDebuggingEnablerTest failures.
...
Fixes: 151065069
Test: robotests
Change-Id: I0bd04e95a66113f379ca7328a4cd31df0ce40b54
2020-03-09 18:36:25 +08:00
Jason Chiu
130629b1db
Show paired devices on Bluetooth device slice card
...
- support tapping to activate for all available media devices including
Hearing aid and Headset
- support tapping to connect for previously connected devices
Bug: 149667096
Test: robotest
Change-Id: I25f74b1b20fbb1876200a561775aa675ff60ac37
2020-03-09 17:43:29 +08:00
Automerger Merge Worker
69c1b703df
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
am: 0571803b3e
...
Change-Id: If7fed6bf73563001c47fb238aab1cddc60f3a342
2020-03-09 08:29:55 +00:00
Automerger Merge Worker
6a6d437ffb
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
am: 888ebb0dbb
...
Change-Id: If70d8e287b77b2b8dc68e2fa6a11beb78a75599f
2020-03-09 08:29:39 +00:00
Automerger Merge Worker
0571803b3e
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
...
Change-Id: I1aee655c4001e52f3af2ffe8b22c3edb615acee0
2020-03-09 08:20:59 +00:00
Automerger Merge Worker
888ebb0dbb
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
...
Change-Id: I2e0c16d8c8e0d593737f52afa97b65a9d474c1d1
2020-03-09 08:20:23 +00:00
Menghan Li
42dcad9b2b
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev
2020-03-09 08:01:56 +00:00
Automerger Merge Worker
22b6d23fae
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
am: 9b0ed6dfbf
...
Change-Id: Ib64f939080800aac93a03ef510d0219d7367fbb3
2020-03-09 05:39:26 +00:00
Automerger Merge Worker
815f3498b8
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
am: 0ebbf934af
...
Change-Id: I4c6bb18524bf97a065b4733ff50e5d3084ee6edd
2020-03-09 05:39:15 +00:00
Automerger Merge Worker
9b0ed6dfbf
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
...
Change-Id: I5b68b2275b29089ebb9c6b509a02cc6f857a23e5
2020-03-09 05:29:48 +00:00
Automerger Merge Worker
0ebbf934af
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
...
Change-Id: Ie8fdaae839e1eb0df5907f04738de2e49882906d
2020-03-09 05:29:36 +00:00
TreeHugger Robot
5a4257deb4
Merge "[Wi-Fi] Remove redundant code" into rvc-dev
2020-03-09 05:15:25 +00:00
Automerger Merge Worker
a080d8a016
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
am: d4970a9df1
...
Change-Id: Ia59c42089646102ad763d6d952434d1efa25a89f
2020-03-09 04:28:48 +00:00
Automerger Merge Worker
221357cef9
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
am: 8d7579e6b1
...
Change-Id: I2b94c6c407738096d1d3657c9012abbe5135d833
2020-03-09 04:28:32 +00:00
Automerger Merge Worker
d4970a9df1
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
...
Change-Id: I035e835ec5565100464fe1b14108b49cedca7546
2020-03-09 04:13:27 +00:00
Automerger Merge Worker
8d7579e6b1
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
...
Change-Id: Idbaf87b5e50930bd2a7aa2af3ec6b87e32b31e16
2020-03-09 04:13:26 +00:00
Automerger Merge Worker
fed106ea1e
Merge "Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
am: be6aa4d56e" into rvc-d1-dev-plus-aosp
2020-03-09 04:04:38 +00:00
Automerger Merge Worker
c2395edf5e
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
am: 0e05847f2b
...
Change-Id: Ibbc6c35ba70781c42a5f339690bb82d322232b2f
2020-03-09 04:04:32 +00:00
Automerger Merge Worker
a87391d147
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
am: be6aa4d56e
...
Change-Id: I191139d52e10eff9fb0151f1c5c5dde8e6735beb
2020-03-09 04:04:31 +00:00
TreeHugger Robot
bde2d44bb1
Merge "Refresh summary when update state of preference" into rvc-dev
2020-03-09 04:01:11 +00:00
Automerger Merge Worker
0e05847f2b
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
...
Change-Id: Ia4f3155fd2820da536e1f9822ca181ab625d36d7
2020-03-09 03:45:29 +00:00
Automerger Merge Worker
be6aa4d56e
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
...
Change-Id: I0ce507c307abd057788a6af0f21f9fd22f59aad5
2020-03-09 03:45:25 +00:00
TreeHugger Robot
7d6011be10
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev
2020-03-09 03:29:30 +00:00
Arc Wang
ced9c346a5
[Wi-Fi] Remove redundant code
...
Should not setSummary in ConnectedWifiEntryPreference because
WifiEntryPreference updates summary by WifiEntry#getSummary
Bug: 150911380
Test: manual
See captive portal Wi-Fi summary 'Sign in to network'
before logging in.
Change-Id: Ibc47623d66b9d2844c0ca827081f205f0bab89e7
2020-03-09 10:47:58 +08:00
Automerger Merge Worker
d6aa406045
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
am: 423133c22b
...
Change-Id: I982afbcb983942f1d0d02d2be08d29389c2bddec
2020-03-09 02:21:37 +00:00
Automerger Merge Worker
6a121c73c7
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
am: 3bc7a52a36
...
Change-Id: Icdb9198be6abf0c1e4625438438e23a062085c9b
2020-03-09 02:21:06 +00:00
Automerger Merge Worker
423133c22b
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
...
Change-Id: Ibe535a64b8f369575ea1dbeafb04b31017599642
2020-03-09 02:11:10 +00:00
Automerger Merge Worker
3bc7a52a36
Merge "Update failed test case" into rvc-dev am: 9e5142b14d
...
Change-Id: Ia0a7848915d207d69b051cfee0ef1547ae98a0f6
2020-03-09 02:10:34 +00:00
tim peng
9e5142b14d
Merge "Update failed test case" into rvc-dev
2020-03-09 01:53:35 +00:00
Automerger Merge Worker
0204e72806
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55
-s ours am: 75b92d9a07
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie719fca620201d22714e469d66a4a3a661ceec65
2020-03-08 20:38:03 +00:00
Automerger Merge Worker
2f97987e14
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55
-s ours am: 824aec4faf
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I34869c5020fc83627fd3fc48bf2f89ac0166b2db
2020-03-08 20:37:54 +00:00
Automerger Merge Worker
75b92d9a07
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib2bf0fa6dcc48cc989c8deda90f8ac012e648a41
2020-03-08 20:22:26 +00:00
Automerger Merge Worker
824aec4faf
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I4f446401a416b8720e06c08882649f719b4dd215
2020-03-08 20:22:16 +00:00
Bill Yi
9ce0e0ca55
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I7966ad0beaa4bde063f8fc3ec17ce152b9acb3ac
2020-03-07 22:06:24 -08:00
Automerger Merge Worker
aeeb6405a1
[automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e
am: 1ec7c14b3b
-s ours am: c799d3bc49
-s ours
...
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1
is in history
Change-Id: Ie0e9f3ee5f73f7db555a50a3cec2b9c6fcdbed70
2020-03-08 05:39:10 +00:00
Automerger Merge Worker
c799d3bc49
[automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e
am: 1ec7c14b3b
-s ours
...
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1
is in history
Change-Id: I8352d1b47e9d8bb71442d0f62bdf3717794d1089
2020-03-08 05:26:30 +00:00