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
ce7b012f9c
Merge "[Wi-Fi DPP] Remove scanner button of unsaved WiFi network dialogs"
2019-06-19 04:55:24 +00: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
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
TreeHugger Robot
e2ab7540a3
Merge "MobileData slice should be null if not-actionable" into qt-dev
2019-06-19 02:26:20 +00: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
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
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
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
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
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
TreeHugger Robot
5cb9f7801c
Merge "Fix double divider in Privacy page"
2019-06-18 06:50:24 +00:00
Jason Chiu
f3e3d7a46b
Fix double divider in Privacy page
...
The second divider is shown after we set a background to the pinned
header.
- Simply hide the pinned header instead of its inner views.
- Move setActionBarShadowAnimation to controller and just call it when
the bar chart is available.
Fixes: 134652710
Test: robotest, visual
Change-Id: I4381e5ca1a042583d3e5874f5600719267b19786
2019-06-18 11:50:45 +08:00
Kevin Chyn
93ea1f8440
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev am: 5ac3690908
...
am: 0a519b9cbb
2019-06-17 19:31:24 -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
a16818f19f
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a am: 6a3f2bfe2a
...
am: 426d0a70fa
2019-06-17 19:04:35 -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
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
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
Ivan Podogov
e142b7ee3f
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 8573d27d31
...
am: aa813f5618
2019-06-17 06:03:09 -07: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
72bb3cc1f6
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
...
am: 9a1c75c57a
2019-06-17 05:49:13 -07:00
Ivan Podogov
8573d27d31
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
...
am: 9a1c75c57a
2019-06-17 05:49:13 -07:00
Ivan Podogov
9a1c75c57a
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
2019-06-17 12:39:10 +00:00
Kevin Chyn
ad363b091f
Merge "Update string for work profile face unlock" into qt-r1-dev am: 5d8cd009fa
...
am: 031affb92b
2019-06-14 18:36:41 -07:00
Kevin Chyn
031affb92b
Merge "Update string for work profile face unlock" into qt-r1-dev
...
am: 5d8cd009fa
2019-06-14 18:13:03 -07:00
Kevin Chyn
5d8cd009fa
Merge "Update string for work profile face unlock" into qt-r1-dev
2019-06-15 00:49:36 +00:00
Mehdi Alizadeh
896b2c6e0e
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964 am: 2fbd41a326
...
am: d8220f8a46
2019-06-14 17:35:34 -07:00
Mehdi Alizadeh
d8220f8a46
Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964
...
am: 2fbd41a326
2019-06-14 17:20:45 -07:00
Mehdi Alizadeh
2fbd41a326
Show a dialog with a slider to set the back gesture's sensitivity
...
am: 7d43125964
2019-06-14 17:11:54 -07:00
Mehdi Alizadeh
d8818a5a21
Show a dialog with a slider to set the back gesture's sensitivity
...
am: 7d43125964
2019-06-14 17:09:54 -07:00
Mehdi Alizadeh
7d43125964
Show a dialog with a slider to set the back gesture's sensitivity
...
Bug: 131447780
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Change-Id: I9fcd1a50c77689118857326de0cf8082e835b491
2019-06-14 23:40:11 +00:00
Lei Yu
3d1f180b1c
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc am: ab2a2b3d3f
...
am: daed3366ef
2019-06-14 16:17:37 -07:00
Lei Yu
daed3366ef
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
...
am: ab2a2b3d3f
2019-06-14 16:06:03 -07:00
Yi Jiang
5bb10c46d2
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev am: 575bdfcaad
...
am: 7810fcc70c
2019-06-14 16:03:20 -07:00
Lei Yu
ab2a2b3d3f
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
2019-06-14 15:59:10 -07:00
Lei Yu
192367bef2
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
...
am: b4d94a8ccc
2019-06-14 15:56:10 -07:00
Lei Yu
b4d94a8ccc
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
2019-06-14 22:38:59 +00:00
Yi Jiang
7810fcc70c
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
...
am: 575bdfcaad
2019-06-14 15:36:12 -07:00
Yi Jiang
575bdfcaad
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
2019-06-14 22:14:13 +00:00
