Automerger Merge Worker
e66f87a626
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 0571803b3e am: 69c1b703df
...
Change-Id: I72d4f090542bc0843d6dd4876c7a762263b9393b
2020-03-09 08:39:41 +00:00
Automerger Merge Worker
538ab8c28b
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 888ebb0dbb am: 6a6d437ffb
...
Change-Id: I6f5ab47f5e2cb59aec275ddf9d17e63e501e4fa6
2020-03-09 08:39:02 +00: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
4f5d539cb2
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af am: 2bed7b4060 am: bcb733a27d
...
Change-Id: Ie39d61ceca0e2ad8e9b97501f2942fb4c3f4e530
2020-03-09 08:20:34 +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
bcb733a27d
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af am: 2bed7b4060
...
Change-Id: Id10bf39a188637dbf86438e866fbcb40a870c138
2020-03-09 07:59:50 +00:00
Automerger Merge Worker
58de9689d3
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1 am: cfdf35b8ba am: 2c63143255
...
Change-Id: I0cc43bc2277f72b1a1a5c9dff38e7eaa00a8609e
2020-03-09 06:40:56 +00:00
Automerger Merge Worker
2c63143255
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1 am: cfdf35b8ba
...
Change-Id: I06e30b654cb5925e7f09ed271fd61004911a2543
2020-03-09 06:27:32 +00:00
Automerger Merge Worker
3585c4f7c1
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 9b0ed6dfbf am: 22b6d23fae
...
Change-Id: I1cd392bd2ea98251e4d0a48d0f5fb28c91670e89
2020-03-09 05:45:59 +00:00
Automerger Merge Worker
f3e20a2bc8
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af am: 815f3498b8
...
Change-Id: Ifabb4115e3b38e13e0d436dda5975e846f4cc443
2020-03-09 05:45:38 +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
2bed7b4060
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af
...
Change-Id: Iaf92fcfbe1184582d2eb3886cfc59890ad3f383c
2020-03-09 05:39:21 +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
42a2ca5927
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e am: 185c089e2a am: 1be993ac10
...
Change-Id: I5f3697bbae6370783098781f45919ddb21bea39b
2020-03-09 05:29:49 +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
Automerger Merge Worker
1be993ac10
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e am: 185c089e2a
...
Change-Id: I7c3a8be790499259eb56b7c6fc13850d6a1b5963
2020-03-09 05:19:08 +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
701d779019
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: e7e0c7a17b am: 80ef08bac2
...
Change-Id: I3cddf77f07ebdb953e7adc320307d205742390b2
2020-03-09 05:05:25 +00:00
Automerger Merge Worker
80ef08bac2
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: e7e0c7a17b
...
Change-Id: Ie603a22f987d8d933759f0740eb44ad3024a0d68
2020-03-09 04:52:59 +00:00
Automerger Merge Worker
2d16a4b8a5
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: d4970a9df1 am: a080d8a016
...
Change-Id: I6f47e0b36a4d935794e8a6db8d68154928ba2127
2020-03-09 04:36:13 +00:00
Automerger Merge Worker
e840eb9f3c
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1 am: 221357cef9
...
Change-Id: I5a888c0b21eb87ae891f8e78f19fdc4bf3f8c839
2020-03-09 04:36:07 +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
cfdf35b8ba
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1
...
Change-Id: Ia6b057c655a97bbaa2c67b4fc388749d77740493
2020-03-09 04:28:47 +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
347181da79
Merge "Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e" into rvc-d1-dev-plus-aosp am: fed106ea1e
...
Change-Id: Ib4bc6ea905c7d6b3e45e1d26f6f6a9cc9089be12
2020-03-09 04:13:22 +00:00
Automerger Merge Worker
49d43c3cd0
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: 0e05847f2b am: c2395edf5e
...
Change-Id: I69c439d6ddec07d3da9f69397516af708f98e740
2020-03-09 04:13:08 +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
185c089e2a
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e
...
Change-Id: Id9a1d53f8fc7002ef8ceffae6c9c1702edb4e8cc
2020-03-09 04:04:31 +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
5e19adc7f9
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b am: d6aa406045
...
Change-Id: I3b9f8ee94452b43623437e2e88856cfba10c2831
2020-03-09 02:38:12 +00:00
Automerger Merge Worker
90b95b0c38
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 3bc7a52a36 am: 6a121c73c7
...
Change-Id: Ibba21f2252885acebec44164081d227f7b70d42e
2020-03-09 02:36:49 +00: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
e7e0c7a17b
Merge "Update failed test case" into rvc-dev am: 9e5142b14d am: 423133c22b
...
Change-Id: I0c78605f8d96dd8d3ee05c3c48ae451c037a0ba2
2020-03-09 02:21:24 +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
3036bdf7d1
[automerger skipped] Import translations. DO NOT MERGE am: 9ce0e0ca55 -s ours am: 75b92d9a07 -s ours am: 66e7c85589 -s ours am: 7cafa9db06 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I9ce20f1ad6f16022bddd897d8432c0a35525a301
2020-03-08 23:02:56 +00:00
