Arc Wang
781a61930c
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev am: d64b6c8846 am: 9b971efd6b
...
am: 6d435d69b3
Change-Id: I7aeb116d93e608204541d626b48274ffd8254bb6
2019-06-19 21:34:36 -07:00
Antony Sargent
2ee1249b01
Add a listener for subscription changes to SimDialogFragment am: 6a1d7e60ac
...
am: d985cb848f
Change-Id: Ifb25c4c11e394452b475442dbe452272f52b229e
2019-06-19 20:56:36 -07:00
Arc Wang
6d435d69b3
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev am: d64b6c8846
...
am: 9b971efd6b
Change-Id: I12af9c0f4aef532f114dc5d2f28ba82cc38c1a21
2019-06-19 20:27:51 -07:00
Arc Wang
9b971efd6b
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
...
am: d64b6c8846
Change-Id: Icfa3b21e383182a127a1e633a671013c371ab105
2019-06-19 19:38:57 -07:00
Antony Sargent
d985cb848f
Add a listener for subscription changes to SimDialogFragment
...
am: 6a1d7e60ac
Change-Id: I7fe944662d3a37223a997ed55d3197764df42a90
2019-06-19 19:07:32 -07:00
Arc Wang
d64b6c8846
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
2019-06-20 01:34:09 +00:00
Antony Sargent
6a1d7e60ac
Add a listener for subscription changes to SimDialogFragment
...
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.
But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.
Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
2019-06-19 12:20:59 -07:00
Arc Wang
7395ed8c53
Merge "Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am: d8916ef151 am: 3454468111" into qt-r1-dev-plus-aosp
...
am: fea20fd758
Change-Id: Ia67d5ef5e2fc115a1e9d40d7157718bc9a4df9c2
2019-06-19 10:40:32 -07:00
Arc Wang
0a628e227a
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am: d8916ef151 am: c58b3aaf0f
...
am: 8c123c6a59
Change-Id: Id6caccbcd9790e0f9393b8b0ddea6ebb529706b6
2019-06-19 10:36:46 -07:00
Android Build Merger (Role)
fea20fd758
Merge "Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am: d8916ef151 am: 3454468111" into qt-r1-dev-plus-aosp
2019-06-19 17:28:41 +00:00
Arc Wang
1cd16d3891
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am: d8916ef151
...
am: 3454468111
Change-Id: I98730ea805ee44926b9881c07bb0fff39975685d
2019-06-19 10:27:35 -07:00
Arc Wang
8c123c6a59
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am: d8916ef151
...
am: c58b3aaf0f
Change-Id: I44c813e93d563fff6956d3b15bc08da143023437
2019-06-19 10:26:08 -07:00
Arc Wang
3454468111
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
...
am: d8916ef151
Change-Id: I37b2fd97fbe952d9cdc214b364ff766231158d4d
2019-06-19 10:15:44 -07:00
Arc Wang
c58b3aaf0f
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
...
am: d8916ef151
Change-Id: I360ff827ae8544d76c4411410172ace81bbcef56
2019-06-19 10:14:55 -07:00
TreeHugger Robot
d8916ef151
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
2019-06-19 16:54:35 +00:00
TreeHugger Robot
21da32d9b1
Merge "Pull out PreferenceControllers from AccessibilitySettings"
2019-06-19 16:50:22 +00:00
Mill Chen
d37618c8ed
Pull out PreferenceControllers from AccessibilitySettings
...
- clean up the format of accessibility_settings
- To leverage the existing TtsPreferenceController and
FontSizePreferenceController
- pull out the logic of magnification from AccessibilitySettings
Bug: 135056871
Test: manual, robotest
Change-Id: I414fa7a04fd558d3a3a8b5e157469c198a772732
2019-06-19 15:05:39 +00:00
TreeHugger Robot
174c9b7f82
Merge "Pull out a PreferenceController of lock screen from accessibility"
2019-06-19 10:15:25 +00:00
TreeHugger Robot
8d51b1b4e8
Merge "[Wi-Fi DPP] Improve Wi-Fi QR code error messages"
2019-06-19 10:05:45 +00:00
Mill Chen
dce601db84
Pull out a PreferenceController of lock screen from accessibility
...
To reduce the complexity of AccessibilitySettings, we are planning to
create a bunch of preference controllers. First of all, we are converting
lock screen preference to a preference controller. The rest part will be
uploaded soon.
Bug: 135056871
Test: robotest, manual
Change-Id: I6079136f3d08934c9a5363eb4d0e0ade29f8ba99
2019-06-19 16:44:42 +08:00
TreeHugger Robot
11e1d45c9c
Merge "[Wi-Fi DPP] Fix UI defects"
2019-06-19 06:17:22 +00:00
Kevin Chyn
ba94606bd8
Merge "Lockscreen bypass should be searchable" into qt-r1-dev am: 411e99597f
...
am: 21e25c65ea
Change-Id: I14756f2ff9fadde44379e0d2a945c98ccbe86063
2019-06-18 23:11:12 -07:00
Kevin Chyn
21e25c65ea
Merge "Lockscreen bypass should be searchable" into qt-r1-dev
...
am: 411e99597f
Change-Id: I3887213e8180aa62ea9496282072cdd16e9ffc76
2019-06-18 22:49:00 -07:00
Malcolm Chen
d0b6f9339d
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce am: cdae15bcc4
...
am: 2044f474d1
Change-Id: Ic67a89244b1fb87d81ac6e16001abd0656fc98df
2019-06-18 22:42:59 -07:00
Android Build Merger (Role)
00fe5ebc8d
Merge "Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce am: b3b52ce088 am: 47ea5ad9dc"
2019-06-19 05:16:18 +00:00
Malcolm Chen
af7b0ebb9c
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce am: b3b52ce088
...
am: 47ea5ad9dc
Change-Id: Ida614addc7b6cc58178f91e7e6b2645100762723
2019-06-18 22:14:39 -07:00
Android Build Merger (Role)
58c922da9d
Merge "Merge "Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3 am: 60a1dc1609" into qt-r1-dev-plus-aosp am: a406acea2d"
2019-06-19 05:13:46 +00:00
Matthew Fritze
86d4b481cf
Merge "Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3 am: 60a1dc1609" into qt-r1-dev-plus-aosp
...
am: a406acea2d
Change-Id: Ie796ddf3ee3cbc35e724935d9ba0811c8324227b
2019-06-18 22:13:14 -07:00
Android Build Merger (Role)
b34a3ec1d9
Merge "Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3 am: 1601d41f8a am: ae7ca4133a"
2019-06-19 05:12:25 +00:00
Matthew Fritze
a891dd8743
Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3 am: 1601d41f8a
...
am: ae7ca4133a
Change-Id: I1e3012e83243b9dd6be04f1ecc5d885836b8e022
2019-06-18 22:11:48 -07:00
TreeHugger Robot
411e99597f
Merge "Lockscreen bypass should be searchable" into qt-r1-dev
2019-06-19 05:05:43 +00:00
TreeHugger Robot
ce7b012f9c
Merge "[Wi-Fi DPP] Remove scanner button of unsaved WiFi network dialogs"
2019-06-19 04:55:24 +00:00
Bill Yi
5a6ec586dc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 304271b664 -s ours
...
am: 246a514a5e -s ours
am skip reason: subject contains skip directive
Change-Id: I21e6db19a2a93f329871628bd0ced05b8f39378d
2019-06-18 21:26:14 -07:00
Malcolm Chen
2044f474d1
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
...
am: cdae15bcc4
Change-Id: Id0dc496b502942b86eca716887d6e5042166bf97
2019-06-18 21:16:01 -07:00
Malcolm Chen
47ea5ad9dc
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
...
am: b3b52ce088
Change-Id: I672ddbb1a853d16e7a17a2c95fa4754e17d7055c
2019-06-18 20:48:05 -07:00
Android Build Merger (Role)
a406acea2d
Merge "Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3 am: 60a1dc1609" into qt-r1-dev-plus-aosp
2019-06-19 03:40:32 +00:00
Matthew Fritze
a57687b50f
Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3
...
am: 60a1dc1609
Change-Id: Ia745e49ee270f2a2d0c114d3a23e8cff48bf5681
2019-06-18 20:40:10 -07:00
Matthew Fritze
ae7ca4133a
Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3
...
am: 1601d41f8a
Change-Id: Ic1bce363e5b6d6a5e52fcf3da6547d1976333f2e
2019-06-18 20:39:39 -07:00
Bill Yi
246a514a5e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 304271b664 -s ours
am skip reason: subject contains skip directive
Change-Id: I99fdb06349fd83d32918a358759d36b463abb6b0
2019-06-18 20:30:00 -07:00
Malcolm Chen
b3b52ce088
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
...
am: 0304f4d1ce
Change-Id: I3a78fe154d3861c779365d1e611ac8c559861a10
2019-06-18 20:29:39 -07:00
Malcolm Chen
cdae15bcc4
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
...
am: 0304f4d1ce
Change-Id: I9f91b0292b464e76db849163573031dba8bef5a1
2019-06-18 20:28:40 -07:00
Matthew Fritze
1601d41f8a
Merge "MobileData slice should be null if not-actionable" into qt-dev
...
am: e2ab7540a3
Change-Id: If562aec8635ab4d56ff5016eea5d19d2a96e2383
2019-06-18 20:23:30 -07:00
Matthew Fritze
60a1dc1609
Merge "MobileData slice should be null if not-actionable" into qt-dev
...
am: e2ab7540a3
Change-Id: Ie4630b5927b93083e6b970cb67da04cbc19a2c50
2019-06-18 20:23:29 -07:00
TreeHugger Robot
0304f4d1ce
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
2019-06-19 03:11:25 +00:00
Bill Yi
d6795e4dd7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours am: 13164367b5 -s ours
...
am: f175f5d842 -s ours
am skip reason: subject contains skip directive
Change-Id: I347e88a8ad76d2c2ffe03f6af9c8c136d3e6e37c
2019-06-18 19:49:22 -07:00
Antony Sargent
4c55d40190
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am: 40e9ffc2f0 am: ff1c4940c8
...
am: 7adc8424a5
Change-Id: Ia3c597810929b67faa9b9c3e934cfec2b2851484
2019-06-18 19:48:02 -07:00
Bill Yi
cca0b1b66a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours am: 38fba3b6d0 -s ours
...
am: c28634a2bb -s ours
am skip reason: subject contains skip directive
Change-Id: I755b648f0453a18ff59e9a02d02e9bf2cecc1a92
2019-06-18 19:37:40 -07:00
TreeHugger Robot
e2ab7540a3
Merge "MobileData slice should be null if not-actionable" into qt-dev
2019-06-19 02:26:20 +00:00
Arc Wang
00c8b534cd
[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail
...
After a user uses Wi-Fi QR code scanner to scan a QR code of an unreachable
Wi-Fi network, the scanner does not recognize any QR code until the scanner is
restarted or back from a screen off state.
To restart QrCamera after a Wi-Fi QR code recognition, we should stop it before
start, otherwise the DecodeTask will not work.
Bug: 135225856
Test: Scan a Wi-Fi QR code of unreachable Wi-Fi network and
scan a Wi-Fi QR code of reachable Wi-Fi network, check
if the scanner recognizes QR code.
Change-Id: I0063c867d8e4046f184d02134bda842887c003a1
2019-06-19 10:01:17 +08:00
Kevin Chyn
06f22da547
Lockscreen bypass should be searchable
...
Fixes: 135566785
Test: Searchable now
Change-Id: Idae804f77ea5b7680c2dbe585bfec5078bb56c8f
2019-06-18 19:00:25 -07:00