Automerger Merge Worker
191371fdc8
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: c480a5a219 am: 0c601ed9ca
...
Change-Id: I967e431deaa99ba0a57bbd679f0cea89deafbaaa
2020-03-04 07:56:29 +00:00
Automerger Merge Worker
e2824665f2
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba am: 5452c86902
...
Change-Id: I381a9823da5d54ffebbd33a2b773c74796bebadd
2020-03-04 07:46:14 +00:00
Automerger Merge Worker
0c601ed9ca
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: c480a5a219
...
Change-Id: Ib562cfc082f5dd8023dcc0f1f37cfc3d1ff7c2ca
2020-03-04 07:45:40 +00:00
Automerger Merge Worker
7c59f85d84
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70
...
Change-Id: Ic3b3fc21c1ad2694bb21067d43ba1da533a6bb24
2020-03-04 07:44:45 +00:00
Automerger Merge Worker
cf6bc20c70
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
...
Change-Id: I0f4a089a31374ccea3fbf8f7b9ffcf1eed50fa1f
2020-03-04 07:25:29 +00:00
Automerger Merge Worker
5452c86902
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba
...
Change-Id: I5b711a731d988d24ac10ea5eeb1bdfd95a7d7000
2020-03-04 07:25:28 +00:00
Automerger Merge Worker
c480a5a219
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
...
Change-Id: I1b3249edd8b1c3ceb653c8d82571ddf29032e947
2020-03-04 07:25:13 +00:00
Automerger Merge Worker
b62bdbb1ba
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
...
Change-Id: I5debb5a498a2a898cccf74d61209597295e3bd46
2020-03-04 07:04:26 +00:00
Automerger Merge Worker
85b274b6c9
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
...
Change-Id: I43a6edf20ab7fdaa5323d6b955e3f5408423629e
2020-03-04 07:04:18 +00:00
Yanting Yang
0ab87cce3d
Merge "Fix double scroller of App info page" into rvc-dev
2020-03-04 06:51:19 +00:00
Tim Peng
2688639b05
Add package name when launching output switcher from remote slice
...
Bug: 150742783
Test: make -j42 RunSettingsRoboTests
Change-Id: I670870cd314dc9a51d7a9a58837b95b4b8cf8808
2020-03-04 13:30:41 +08:00
Automerger Merge Worker
35a3e47b10
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad am: 85321037af am: 0327de2860
...
Change-Id: I8d7548e8536d014b1bd4092ae17f94b7e1ef153d
2020-03-04 04:10:26 +00:00
Automerger Merge Worker
aec038b1d0
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4 am: 2b9a685801 am: ca33958483
...
Change-Id: I6cd4541e455947f19bd91496a202b0a20285a38d
2020-03-04 04:10:24 +00:00
Automerger Merge Worker
9a2e6e68ff
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded am: 92d19c19a6 am: 43f995eab5
...
Change-Id: I7160d7e885b0f2a71867eba298d4c40c48801526
2020-03-04 04:10:23 +00:00
Automerger Merge Worker
c098349d37
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours am: 4954088094 -s ours am: 66e930120e -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 04:10:14 +00:00
Automerger Merge Worker
892360ee4e
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129 am: a3f11009b6 am: 58b74c724b
...
Change-Id: I6a339fa097809f0e69a39bb908b303a11439ab2e
2020-03-04 04:10:02 +00:00
Brad Ebinger
66c709844a
Add new DialogFragment and Controller for capability discovery opt-in
...
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.
Also removes multiple updateSubscriptions() happening when the
activity is first created from onStart() and onChanged() callbacks.
Bug: 111305845
Test: manual
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-03 19:39:27 -08:00
Automerger Merge Worker
0327de2860
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad am: 85321037af
...
Change-Id: I491a7092dbdfa493a12e22a3bebf085381db30ec
2020-03-04 03:32:40 +00:00
Automerger Merge Worker
ca33958483
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4 am: 2b9a685801
...
Change-Id: Ia8f771ffab5c2103a631d84cdc007c94e25057c5
2020-03-04 03:32:38 +00:00
Automerger Merge Worker
43f995eab5
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded am: 92d19c19a6
...
Change-Id: Icc0b73025b546b70306e4992a44a8c26a95d06ad
2020-03-04 03:32:37 +00:00
Automerger Merge Worker
66e930120e
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours am: 4954088094 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:32:29 +00:00
Automerger Merge Worker
58b74c724b
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129 am: a3f11009b6
...
Change-Id: I4ac6c75e64f5700142096ac01f2750d8d99d238e
2020-03-04 03:32:22 +00:00
Automerger Merge Worker
e5ac1dab58
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c am: b4acbd0cb3 am: 0d98e8fa4b
...
Change-Id: I8b0070832297dcfdbd057eacd40bb057d46d4d2d
2020-03-04 03:26:04 +00:00
Automerger Merge Worker
289590a907
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 74bd004539 am: 2ba30b9e04 am: cb4f092b3a
...
Change-Id: I2c25664b705e7d3e28a2e1823090fbab33ab3200
2020-03-04 03:26:03 +00:00
Automerger Merge Worker
256338ce2f
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: ddaa0871cb am: 32df3f1e11 am: ff6df6c618
...
Change-Id: I672041d87a20ab67736a7f84805ef16291b4b2ba
2020-03-04 03:26:02 +00:00
Automerger Merge Worker
beeed27ef0
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: aa8531e082 -s ours am: 05e452fabf -s ours am: b86ad255e7 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:25:51 +00:00
Automerger Merge Worker
5e34cd7913
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: d105b75046 am: eef2d790d2 am: c763503a4f
...
Change-Id: I885300331b02456416bfb889a5feb175cfe3f4e1
2020-03-04 03:25:45 +00:00
Automerger Merge Worker
62265523c0
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 5171781e75 am: 63ec77bff4
...
Change-Id: I9ee9f7ef973748fc708053ef0a8542b3e93f5d77
2020-03-04 03:25:38 +00:00
Automerger Merge Worker
4ef8eb2c1a
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: cfbdb03d2d am: 1ea9d6a29b
...
Change-Id: I49006a8beaa855da41e0aedf34964d508daea8a7
2020-03-04 03:25:36 +00:00
Automerger Merge Worker
56cf400bab
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 50aefb75b0 am: 0b02a2334f
...
Change-Id: I21da405a59a84ad88981f27de5f8ddcbb9b85281
2020-03-04 03:25:35 +00:00
Automerger Merge Worker
f76822fca2
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: 8e78fccbab -s ours am: 6877fa9338 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:25:24 +00:00
Automerger Merge Worker
3dbd8cd4f6
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: ec9c799dcc am: 40044775d2
...
Change-Id: I249c27ce2899268cb16c2677bbd819f366911c60
2020-03-04 03:25:18 +00:00
Automerger Merge Worker
ed6008efa8
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa am: ed46a7d526 am: a5e4198546
...
Change-Id: If7467b1191097fa47f93e0ff3f8419bc69967455
2020-03-04 03:24:36 +00:00
Automerger Merge Worker
0d98e8fa4b
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c am: b4acbd0cb3
...
Change-Id: I8bd596281aa63caac16530dd5006245fd1173ba7
2020-03-04 03:13:41 +00:00
Automerger Merge Worker
cb4f092b3a
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 74bd004539 am: 2ba30b9e04
...
Change-Id: I344dc579625e54657baee4cce2ab91af9e7a79ed
2020-03-04 03:13:40 +00:00
Automerger Merge Worker
ff6df6c618
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: ddaa0871cb am: 32df3f1e11
...
Change-Id: If0039b84861e6fff63352d976c9956c146ede7d0
2020-03-04 03:13:38 +00:00
Automerger Merge Worker
b86ad255e7
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: aa8531e082 -s ours am: 05e452fabf -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:13:27 +00:00
Automerger Merge Worker
c763503a4f
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: d105b75046 am: eef2d790d2
...
Change-Id: Ic54d1bfaf3a5b0d574c059ec0bd5a3600d4c6d3b
2020-03-04 03:13:20 +00:00
Automerger Merge Worker
63ec77bff4
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 5171781e75
...
Change-Id: I3b24c9c026ed7d611a2bf7ebe26dcec1643fd592
2020-03-04 03:13:12 +00:00
Automerger Merge Worker
1ea9d6a29b
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: cfbdb03d2d
...
Change-Id: Ide5f552efdfc48dcee67a2794dd6c633fd933ba4
2020-03-04 03:13:10 +00:00
Automerger Merge Worker
0b02a2334f
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 50aefb75b0
...
Change-Id: I469c712a49422b62f51b3e752658773ad6bcc3ae
2020-03-04 03:13:09 +00:00
Automerger Merge Worker
6877fa9338
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: 8e78fccbab -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:12:58 +00:00
Automerger Merge Worker
40044775d2
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: ec9c799dcc
...
Change-Id: I3f0202781080639f28f72cd3acf29818cc887b9c
2020-03-04 03:12:32 +00:00
Automerger Merge Worker
85321037af
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad
...
Change-Id: If0c3f08fca6ce78f94a60ded9ff5d28b471427e1
2020-03-04 03:12:30 +00:00
Automerger Merge Worker
2b9a685801
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4
...
Change-Id: I27831fecf246135f2134621926285152ec664500
2020-03-04 03:12:28 +00:00
Automerger Merge Worker
92d19c19a6
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded
...
Change-Id: I2728bbfeba057aed033e8cb0d8b6f5695a205ca8
2020-03-04 03:12:26 +00:00
Automerger Merge Worker
4954088094
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:12:19 +00:00
Automerger Merge Worker
a3f11009b6
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129
...
Change-Id: Iedd273ba66dc84ea3af2ffc3aa262a3d0120948c
2020-03-04 03:12:12 +00:00
Bill Yi
8e8a5a1a2c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3e95725552e5510a27025a8315fe4ec69dd2bfd8
2020-03-03 19:10:03 -08:00
Automerger Merge Worker
b4acbd0cb3
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c
...
Change-Id: I38325fe26892d8db1a2b4310479744df5da62822
2020-03-04 03:07:10 +00:00
