Bill Yi
e2f660eb6a
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
2019-08-20 13:36:35 -07:00
Kevin Chyn
88b20ce11e
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 88936d4a46
2019-08-20 13:33:52 -07:00
Kevin Chyn
d441ca94bf
Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
...
am: 59538f62c1
2019-08-20 12:45:58 -07:00
Bill Yi
27bc8abe28
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9909286ace
2019-08-20 12:41:39 -07:00
Bill Yi
7a4c37d7e5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 5188a0560f
2019-08-20 12:38:42 -07:00
Arc Wang
4443953daf
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 2394d0821b
2019-08-20 12:25:41 -07:00
Bill Yi
ba8880dd87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
2019-08-20 18:39:09 +00:00
Arc Wang
3fff50e3ba
[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator
...
WifiTracker#getAccessPoints() only contains a hidden SSID Wi-Fi
network if it's a saved Wi-Fi network. We can't check if a hidden
SSID Wi-Fi network is reachable inadvance. That is the difference
after a user scanned a QR code of hidden SSID Wi-Fi network.
Bug: 135892509
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppUtilsTest
manual test:
Click the Share button of a connected hidden SSID Wi-Fi network
and save the QR code image. Use Wi-Fi QR code scanner in Wi-Fi
Settings to scan the saved QR code image.
Change-Id: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
Merged-In: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
2019-08-20 16:15:02 +08:00
Android Build Merger (Role)
451965fab8
Merge "Merge "Remove attention controller" into qt-r1-dev am: 41aafab963 am: 645480a4e4" into qt-qpr1-dev-plus-aosp
2019-08-20 03:07:43 +00:00
Kevin Chyn
3fd14bd081
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 645480a4e4
2019-08-19 20:07:09 -07:00
Kevin Chyn
6dc15d7976
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 88936d4a46
2019-08-19 20:06:32 -07:00
Kevin Chyn
88936d4a46
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
2019-08-19 19:57:37 -07:00
Kevin Chyn
645480a4e4
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
2019-08-19 19:57:37 -07:00
Kevin Chyn
7b8e594e5c
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
2019-08-19 19:57:30 -07:00
android-build-team Robot
63a13925a5
Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release
...
Change-Id: I06a53fb0bfdb3588367768bd06aaaa8a6f94b83d
2019-08-20 02:44:02 +00:00
Kevin Chyn
e3213d4b79
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
(cherry picked from commit 058af41a42
2019-08-20 02:41:31 +00:00
TreeHugger Robot
41aafab963
Merge "Remove attention controller" into qt-r1-dev
2019-08-20 02:37:20 +00:00
Android Build Merger (Role)
b3774dfe29
Merge "Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: d1e331dbcd" into qt-qpr1-dev-plus-aosp
2019-08-19 22:23:17 +00:00
Kevin Chyn
c889474c9c
Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
...
am: d1e331dbcd
2019-08-19 15:22:19 -07:00
Kevin Chyn
2c403efabf
Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
...
am: 59538f62c1
2019-08-19 15:21:56 -07:00
Kevin Chyn
ac55252e28
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
2019-08-19 15:11:17 -07:00
Kevin Chyn
d1e331dbcd
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
2019-08-19 15:09:00 -07:00
Kevin Chyn
59538f62c1
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
2019-08-19 15:08:48 -07:00
Kevin Chyn
ca2bbdfeca
Merge "Remove delay from enroll start button" into qt-r1-dev
2019-08-19 21:50:22 +00:00
Bill Yi
3efb76b03b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9909286ace
2019-08-19 13:28:44 -07:00
Bill Yi
9909286ace
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
2019-08-19 10:42:35 -07:00
android-build-team Robot
25144933f8
Snap for 5811895 from 7892f729a5 to qt-c2f2-release
...
Change-Id: I0540ce5f28f36beeca6c68c07277dac43a4fc8af
2019-08-19 00:45:02 +00:00
Android Build Merger (Role)
1d13f5c8bb
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 978cd2b768 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-08-17 16:55:37 +00:00
Bill Yi
49c7a74c59
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 5188a0560f
2019-08-17 09:55:19 -07:00
Bill Yi
c94de34259
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 978cd2b768
2019-08-17 09:55:17 -07:00
Bill Yi
978cd2b768
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:16 -07:00
Bill Yi
5188a0560f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-17 16:30:21 +00:00
Android Build Merger (Role)
22cbd5ca0d
Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp
2019-08-17 14:28:18 +00:00
Arc Wang
a266ec8ffd
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 0e53b6293d
2019-08-17 07:27:01 -07:00
Arc Wang
aece3458cf
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 2394d0821b
2019-08-17 07:26:55 -07:00
Arc Wang
0e53b6293d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:18:03 -07:00
Arc Wang
2394d0821b
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
f490c7cb7f
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
2019-08-16 20:01:16 -07:00
Android Build Merger (Role)
0abf9968d7
Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp
2019-08-17 02:52:20 +00:00
Kevin Chyn
0967e12b69
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: ddd4fb660e
2019-08-16 19:51:51 -07:00
Kevin Chyn
60c939da52
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
2019-08-16 19:51:51 -07:00
Kevin Chyn
208b633c7e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:51:18 -07:00
Kevin Chyn
ddd4fb660e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:43:00 -07:00
Kevin Chyn
5725d33471
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:42:52 -07:00
