Commit Graph

54899 Commits

Author SHA1 Message Date
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
Raff Tsai
39c6a16aba Cannot switch between multiple TTS engines
That is caused by layout xml changes. The radio button was clickable
in old xml resource. But it is not clickable in new xml resource.
Therefore we can't receive click callback. Fixed by changing
Radio button state when preference is clicked.

Fixes: 135285101
Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.tts"
Change-Id: Idd7bf37d9ccbc1b56d41978d19dc05c8a81cc49a
2019-06-19 16:35:35 +08: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
Kevin Chyn
178c29d374 Merge "Lockscreen bypass should be searchable" into qt-r1-dev
am: 411e99597f

Change-Id: I62aa3ebf75ad14a2d7308a25a813e64e8ce8daa3
2019-06-18 22:40:15 -07:00
TreeHugger Robot
411e99597f Merge "Lockscreen bypass should be searchable" into qt-r1-dev 2019-06-19 05:05:43 +00: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
564176cf59 Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
am: cdae15bcc4

Change-Id: I439e6f7f2f4daeaeaf486b403a859331a40f7099
2019-06-18 20:56:57 -07:00
Matthew Fritze
db521cd6d1 Merge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3
am: 60a1dc1609

Change-Id: I9d446483277b2c8866102f7281b4aad6d3117967
2019-06-18 20:53:55 -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
Bill Yi
576b4628f5 [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: Ic0825b48431b5e48cc22fa8dfe50ec9dff04dd36
2019-06-18 20:18:58 -07:00
TreeHugger Robot
0304f4d1ce Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev 2019-06-19 03:11:25 +00:00
android-build-team Robot
68f12d5d78 Snap for 5671254 from d1defa1bdf to qt-release
Change-Id: I0afcafd1b95491196e19f0472e054875fa0bf72d
2019-06-19 03:11:00 +00:00
android-build-team Robot
a85c4420bf Snap for 5670726 from 509d6bcf73 to qt-c2f2-release
Change-Id: Ieb5d0c2ef9a476d2bd37432ad3a4270baa554237
2019-06-19 03:05:11 +00: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
TreeHugger Robot
304271b664 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-19 00:29:25 +00:00
Malcolm Chen
dd0b2fc380 Replace isSubscriptionEnabled with isActiveSubId.
As we don't allow pSIM modem disablment, we should simply use isActiveSubId
to decide whether a subscription's preferences is changable. This will
avoid potential modem bugs that reports wrong modem status that result
in Setting's UX error.

Bug: 135222940
Test: manual and robo
Change-Id: I7cccf2fdab7c89d26dac4daad51cd5d6f3a90eba
2019-06-18 23:55:35 +00:00
Bill Yi
f175f5d842 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours
am: 13164367b5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic40d45501a913fda209021cdc47438c377b373bc
2019-06-18 16:52:42 -07:00
Bill Yi
af3a162b90 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours
am: 38fba3b6d0 -s ours
am skip reason: subject contains skip directive

Change-Id: I518cf3dd3d4e95f2363039ed3a079600ab683794
2019-06-18 16:46:23 -07:00
Antony Sargent
7adc8424a5 Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am: 40e9ffc2f0
am: ff1c4940c8

Change-Id: I022fdec33cda105450e0bdbde074f0f7608ee04c
2019-06-18 16:29:34 -07:00
Bill Yi
c28634a2bb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours
am: 38fba3b6d0 -s ours
am skip reason: subject contains skip directive

Change-Id: I911dd9b64d166e9af6a658114d689688c67cec5c
2019-06-18 16:28:38 -07:00
Antony Sargent
e02811b578 Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am: 40e9ffc2f0
am: fa274596f0

Change-Id: Ied104a2ae9936e6dfdf54e116c625eee32d8d32b
2019-06-18 16:27:28 -07:00
Bill Yi
13164367b5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1defa1bdf -s ours
am skip reason: subject contains skip directive

Change-Id: I78d7bd69fee301b4a699557b8f14a220f0c69f8b
2019-06-18 16:23:58 -07:00
Bill Yi
38fba3b6d0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1defa1bdf -s ours
am skip reason: subject contains skip directive

Change-Id: I70bae5a8810c6007380091016d3883b8ddce224f
2019-06-18 16:23:36 -07:00
Antony Sargent
37ed7360a5 Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am: 40e9ffc2f0
am: fa274596f0

Change-Id: I55b78412f19b54e51af36c23514f798e99b36d11
2019-06-18 16:06:15 -07:00
Antony Sargent
ff1c4940c8 Merge "Use displayName instead of operator name in MMS data notification" into qt-dev
am: 40e9ffc2f0

Change-Id: Ie50c5041ef4b9df9ef015cd5f147b1c45956893f
2019-06-18 16:02:39 -07:00
TreeHugger Robot
d1defa1bdf Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-18 22:55:52 +00:00
Antony Sargent
fa274596f0 Merge "Use displayName instead of operator name in MMS data notification" into qt-dev
am: 40e9ffc2f0

Change-Id: I0e2e20de501b2a5b3ee8905e69dd3a6eca97d0b1
2019-06-18 15:42:04 -07:00
Kevin Chyn
60e6426012 Merge "Retrieve help URL" into qt-r1-dev
am: 509d6bcf73

Change-Id: I233f80a04f5db4947ffea0581e527c8314f10d9b
2019-06-18 15:22:49 -07:00
Kevin Chyn
23d682873f Merge "Retrieve help URL" into qt-r1-dev
am: 509d6bcf73

Change-Id: I5c91bf36d89d9463ac74db4b949deb6abe7af58a
2019-06-18 15:16:53 -07:00
Bill Yi
b5de5bacac Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59dd19e96657af24f4a38df050b39fcfeb5f3f40
2019-06-18 14:57:58 -07:00
Antony Sargent
40e9ffc2f0 Merge "Use displayName instead of operator name in MMS data notification" into qt-dev 2019-06-18 21:54:33 +00:00
Antony Sargent
37008824e6 Use displayName instead of operator name in MMS data notification
When the phone is in DSDS mode and the user tries to send an MMS message
from the SIM that isn't the default for data, we need to pop up a
notification letting them know that the action can't succeed unless they
turn on the advanced option to allow data use for MMS messages. This
notification was using the operator name instead of the subscription
display name, so it didn't reflect any renaming the user might have done
to keep track of their SIMs, which is obviously confusing especially if
they have two different SIMs for the same carrier. This CL switches to
using the subscription display name in this notification.

Fixes: 134771858
Test: make RunSettingsRoboTests
Change-Id: I6995bf9dd6d5e9544e26f0d8e30e97c4e73ab783
2019-06-18 21:54:22 +00:00
Matthew Fritze
63bc6a1090 MobileData slice should be null if not-actionable
In cases where MobileData should not be changed:
- Airplane mode
- No data subscriptions

we will return a null slice, rather than a slice with a no-op intent
attached as a primary action. The problem with the no-op intent is that
Slices assumes all actions are by definition, actionable, and the the
TalkBack description announces that the item is clickable, which it
really isn't.

We will in the future investigate disabled actions on Slices, but this
is the short-term fix.

Fixes: 132924748
Test: Robolectric
Test: Panel tester app
Change-Id: I1d62af32fe2dd985f0b52ea4188651e76f9c90ec
2019-06-18 14:53:21 -07:00
Bill Yi
7ec175758a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8bd2c1b220673e5f2d54e7d866d329791dcc9c41
2019-06-18 14:38:46 -07:00
TreeHugger Robot
509d6bcf73 Merge "Retrieve help URL" into qt-r1-dev 2019-06-18 21:03:54 +00:00
Kevin Chyn
bd6e80e56d Retrieve help URL
Fixes: 118644802

Test: Help page is seen
Change-Id: Ib89d21ce5027f9ca9c3b6709a9a1301f988a0675
2019-06-18 11:13:31 -07:00
Bill Yi
3901db3f67 [automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
am: 6fd15de6f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I7a78c1443618bdd532ce2b286279a36ebd558fe0
2019-06-18 08:03:29 -07:00
Bill Yi
5a73aed8fb [automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
am: afd0e671c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I44ad85e5865a7ddf1d5865562376eee79c558d6e
2019-06-18 07:56:58 -07:00
Bill Yi
2ee4922fc0 [automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
am: 6fd15de6f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I473acfaa712493f1968f3a34481f45b4f00718d1
2019-06-18 07:55:30 -07:00