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
Bill Yi
6fd15de6f6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 23e86df342
-s ours
am skip reason: subject contains skip directive
Change-Id: I30e310a0e002907d0c0feff041d803dfe7705a54
2019-06-18 07:51:33 -07:00
Bill Yi
afd0e671c7
[automerger skipped] Import translations. DO NOT MERGE
...
am: 23e86df342
-s ours
am skip reason: subject contains skip directive
Change-Id: I849487ffafff0f0585ca6a8cf47c912870bbbca0
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
android-build-team Robot
3660875e65
Snap for 5667727 from 58f6926882
to qt-qpr1-release
...
Change-Id: I07a39187bde29c2d79fabfab19f7f56f7703900a
2019-06-18 03:05:58 +00:00
Andrew Sapperstein
5210e5f7a0
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
Change-Id: Ided87f7c33a2feaf2491bb5890dfbc186261cb93
2019-06-17 20:02:21 -07:00
Andrew Sapperstein
e54ccf67ec
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: e6f8d61135
Change-Id: I5f87f5fc3d107d3d6a3e72b672f928cb86efbda6
2019-06-17 20:00:33 -07:00
Andrew Sapperstein
5022730330
Merge "Add string for module license." into qt-dev am: 05ee8ba830
...
am: 935eac5c7f
Change-Id: I4366da3dc3205c78eae265ae24354a8a07e019bf
2019-06-17 19:59:31 -07:00
Andrew Sapperstein
e6f8d61135
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
Change-Id: I92e73c1774cc32bfc9cfbb3f6ce9470e9410871a
2019-06-17 19:45:27 -07:00
Andrew Sapperstein
935eac5c7f
Merge "Add string for module license." into qt-dev
...
am: 05ee8ba830
Change-Id: I186442a7015dc0fa60a9eadbb9a40b8c4dfdfb83
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
Change-Id: I01484fd5f19146dc37f23eeb66be7f053a55f43b
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
Change-Id: I19725e4ddc93a162ee3570b81cc6810b9be57cff
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
Change-Id: Ic605faf3fbaf042ef9e9336a70973cb13fe38592
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
Change-Id: I298bb3163e8a796cffbe3e9d7ddc1d9bf47cfefc
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
Change-Id: Iedc0340b18af5b52f5f60b03b3333b4ee1b1dce1
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
Change-Id: I76b1faf3e21f5b552ef3ad80660dee0786234d15
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
Change-Id: Ic94e5f918a0db96dd21d8f719231bb65f31bd613
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I8288aaad5df249aabf288870ffa02df611a6976c
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I7fafbd896e3848f5db1750f6aa19986ad9c08b60
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
-s ours
am skip reason: subject contains skip directive
Change-Id: Ida3bd3cf5febf94828981e71997025170febedbf
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
Change-Id: I9131887e90314e41bb7f431dd05675eee513486e
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
Change-Id: Ic35cea1804c77b44136823a3cf7cf422717b343d
2019-06-17 16:47:32 -07:00