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
2019-06-18 08:03:29 -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
Bill Yi
2ee4922fc0
[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
...
am: 6fd15de6f6
2019-06-18 07:55:30 -07:00
Bill Yi
6fd15de6f6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 23e86df342
2019-06-18 07:51:33 -07:00
Bill Yi
afd0e671c7
[automerger skipped] Import translations. DO NOT MERGE
...
am: 23e86df342
2019-06-18 07:47:28 -07:00
Bill Yi
23e86df342
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iac730b3d5c81a72cd072a25c203e67035fae3cf6
2019-06-18 06:25:01 -07:00
android-build-team Robot
a8272f5783
Snap for 5667566 from a5018be48a to qt-release
...
Change-Id: I4591a01d8f90d03bbb89eb2be01ee0c5a9199cf5
2019-06-18 03:13:50 +00:00
android-build-team Robot
26154af42d
Snap for 5667572 from 8ca571f9be to qt-c2f2-release
...
Change-Id: I32ce7283004a09d2349eee4e146c9a9a147cb8dc
2019-06-18 03:07:05 +00:00
Andrew Sapperstein
5210e5f7a0
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
2019-06-17 20:02:21 -07:00
Andrew Sapperstein
e54ccf67ec
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
2019-06-17 20:00:33 -07:00
Andrew Sapperstein
5022730330
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: 935eac5c7f
2019-06-17 19:59:31 -07:00
Andrew Sapperstein
e6f8d61135
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
2019-06-17 19:45:27 -07:00
Andrew Sapperstein
935eac5c7f
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
2019-06-17 19:45:26 -07:00
TreeHugger Robot
05ee8ba830
Merge "Add string for module license." into qt-dev
2019-06-18 02:27:09 +00:00
Bookatz
778bac8717
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 58f6926882
2019-06-17 19:12:01 -07:00
Kevin Chyn
0a519b9cbb
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
...
am: 5ac3690908
2019-06-17 19:07:53 -07:00
Bookatz
426d0a70fa
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 6a3f2bfe2a
2019-06-17 18:54:09 -07:00
Bookatz
91c7deafaf
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
...
am: 58f6926882
2019-06-17 18:51:24 -07:00
Kevin Chyn
6d29acd0ef
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
...
am: 5ac3690908
2019-06-17 18:51:02 -07:00
Bookatz
58f6926882
Merge "If cannot add restricted profile, don't suggest it" into qt-dev
...
am: a5018be48a
2019-06-17 18:43:05 -07:00
Bookatz
6a3f2bfe2a
Merge "If cannot add restricted profile, don't suggest it" into qt-dev
...
am: a5018be48a
2019-06-17 18:43:04 -07:00
Kevin Chyn
5ac3690908
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
2019-06-18 01:40:35 +00:00
TreeHugger Robot
a5018be48a
Merge "If cannot add restricted profile, don't suggest it" into qt-dev
2019-06-18 00:47:16 +00:00
Bill Yi
e3fe597b36
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
...
am: 8ca571f9be
2019-06-17 16:54:17 -07:00
Bill Yi
f0ae19caf4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
...
am: 2a96b7f13e
2019-06-17 16:50:40 -07:00
Bill Yi
605e269e57
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
...
am: 8ca571f9be
2019-06-17 16:49:44 -07:00
Android Build Merger (Role)
50bb07c812
Merge "Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: d13fb40c4c" into qt-r1-dev-plus-aosp
2019-06-17 23:48:22 +00:00
tmfang
dcfde9c65d
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: aa36567d4a
2019-06-17 16:47:32 -07:00
tmfang
3cc51bc280
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: d13fb40c4c
2019-06-17 16:47:32 -07:00
Bill Yi
2a96b7f13e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 99808b4824
2019-06-17 16:46:18 -07:00
Bill Yi
8ca571f9be
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 99808b4824
2019-06-17 16:44:18 -07:00
tmfang
a6d47b246f
Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc
...
am: aa36567d4a
2019-06-17 16:44:15 -07:00
tmfang
aa36567d4a
Merge "Get rid of "Assistant" from apps summary" into qt-dev
...
am: a0ed4291dc
2019-06-17 16:35:20 -07:00
TreeHugger Robot
99808b4824
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-17 23:35:01 +00:00
tmfang
d13fb40c4c
Merge "Get rid of "Assistant" from apps summary" into qt-dev
...
am: a0ed4291dc
2019-06-17 16:34:20 -07:00
Andrew Sapperstein
25efb623eb
Add string for module license.
...
Bug: 135183006
Test: is string addition
Change-Id: I6764331d4ef33242b0bef913f32a62799df173c3
2019-06-17 16:28:21 -07:00
TreeHugger Robot
a0ed4291dc
Merge "Get rid of "Assistant" from apps summary" into qt-dev
2019-06-17 23:05:51 +00:00
Bill Yi
cbd3b1121b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 135215049
Change-Id: I48aaceea6d191bf7af302ad0365505fe96c2e186
2019-06-17 22:15:58 +00:00
Kevin Chyn
92d2aae337
Do not allow toggle to be clickable/focusable
...
The entire preference is already clickable/focusable. Also, changed it so that
the entire preferenceview is clickable/focusable in non-accessibility mode as well
to better match Settings UX.
Also, no need to setClickable, since it is already by default
Fixes: 130398575
Test: With and without accessibility turned on, toggle works
Test: With accessibility turned on, toggle no longer takes a separate
focus in addition to the preference
Change-Id: Iaff05cdf350f8d4f4c0f53b539770a7ad1f7d8ad
2019-06-17 13:15:21 -07:00
Bookatz
673bc9d01c
If cannot add restricted profile, don't suggest it
...
Previously, on devices that cannot add a restricted profile (e.g. most
phones), the Multiple users menu had an option to "Add user", whereas
for devices that can, the option read "Add user or profile". Now it only
says the latter, due to ag/6412347. We add back the original wording
here.
Fixes: 135294519
Test: manual confirmation on a phone that text says "Add user"
Test: m -j ROBOTEST_FILTER=UserSettingsTest RunSettingsRoboTests
Change-Id: Ia166b6ff9c69c0042e8a781be1146a5622177121
2019-06-17 18:33:16 +00:00
Android Build Merger (Role)
ada83062de
Merge "Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 72bb3cc1f6" into qt-r1-dev-plus-aosp
2019-06-17 12:56:46 +00:00
Ivan Podogov
aa813f5618
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 8573d27d31
2019-06-17 05:56:12 -07:00
Ivan Podogov
c30147fbeb
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 72bb3cc1f6
2019-06-17 05:56:10 -07:00
Ivan Podogov
cf0610b838
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
...
am: 8573d27d31
2019-06-17 05:56:09 -07:00
