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
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
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
2019-06-18 21:26:14 -07:00
Malcolm Chen
2044f474d1
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
...
am: cdae15bcc4
2019-06-18 21:16:01 -07:00
Malcolm Chen
47ea5ad9dc
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
...
am: b3b52ce088
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
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
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
2019-06-18 20:30:00 -07:00
Malcolm Chen
b3b52ce088
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
...
am: 0304f4d1ce
2019-06-18 20:29:39 -07:00
Malcolm Chen
cdae15bcc4
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
...
am: 0304f4d1ce
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
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
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
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
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
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
TreeHugger Robot
8933b8bde9
Merge "Check the missing useHomeWfMode case"
2019-06-19 01:30:50 +00:00
Antony Sargent
290279ea59
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am: 40e9ffc2f0 am: fa274596f0
...
am: e02811b578
2019-06-18 17:40:53 -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
2019-06-18 16:52:42 -07:00
Antony Sargent
7adc8424a5
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am: 40e9ffc2f0
...
am: ff1c4940c8
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
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
2019-06-18 16:27:28 -07:00
Bill Yi
13164367b5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1defa1bdf
2019-06-18 16:23:58 -07:00
Bill Yi
38fba3b6d0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1defa1bdf
2019-06-18 16:23:36 -07:00
Kevin Chyn
733fc82c9d
Merge "Retrieve help URL" into qt-r1-dev am: 509d6bcf73
...
am: 60e6426012
2019-06-18 16:06:12 -07:00
Antony Sargent
ff1c4940c8
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev
...
am: 40e9ffc2f0
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
2019-06-18 15:42:04 -07:00
Kevin Chyn
60e6426012
Merge "Retrieve help URL" into qt-r1-dev
...
am: 509d6bcf73
2019-06-18 15:22:49 -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
Youming Ye
31608ace73
Check the missing useHomeWfMode case
...
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-06-18 13:24:38 -07: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
1ba169d3b7
[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours am: afd0e671c7 -s ours
...
am: 5a73aed8fb
2019-06-18 08:07:44 -07:00
Bill Yi
ae52d05c78
[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours am: 6fd15de6f6 -s ours
...
am: 2ee4922fc0
2019-06-18 08:06:30 -07:00
Bill Yi
5a73aed8fb
[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
...
am: afd0e671c7
2019-06-18 07:56:58 -07:00
