Commit Graph

28979 Commits

Author SHA1 Message Date
Malcolm Chen
af7b0ebb9c Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce am: b3b52ce088
am: 47ea5ad9dc

Change-Id: Ida614addc7b6cc58178f91e7e6b2645100762723
2019-06-18 22:14:39 -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

Change-Id: I1e3012e83243b9dd6be04f1ecc5d885836b8e022
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
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
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
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
TreeHugger Robot
0304f4d1ce Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev 2019-06-19 03:11:25 +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
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

Change-Id: I49836c71b909fd84fb123396a79ad47b68de2fb0
2019-06-18 17:40:53 -07: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
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
Kevin Chyn
733fc82c9d Merge "Retrieve help URL" into qt-r1-dev am: 509d6bcf73
am: 60e6426012

Change-Id: I998a7449143cc346aca4c2380fd0f92c4c878955
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

Change-Id: Ie50c5041ef4b9df9ef015cd5f147b1c45956893f
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

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
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

Change-Id: I5e956efb3c15e72180a78887c1709cacc8db61d5
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

Change-Id: I19725e4ddc93a162ee3570b81cc6810b9be57cff
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

Change-Id: Iea411d1ba73f422870fbb76feb5423d75ffdb1ee
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

Change-Id: Ic605faf3fbaf042ef9e9336a70973cb13fe38592
2019-06-17 18:54:09 -07:00
Arc Wang
c7d32d1cc1 [Wi-Fi DPP] Fix UI defects
1. Set scan icon minWidth 64dp instead of 48dp
2. Show finish button after Wi-Fi Easy Connect handshake successfully

Bug: 129666609
Bug: 135490433
Test: manual visual
Change-Id: Ifcdbe61b314a9cce3043965e9e5b67406c4616f9
2019-06-18 09:52:25 +08: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
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

Change-Id: I2a1cb8143c105d4a03c4bffc34ba7bedfa9a83f4
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

Change-Id: Id273f48d67715e3dfdea60873a20c5ae7a7adefc
2019-06-17 05:56:12 -07:00
Ivan Podogov
8573d27d31 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
am: 9a1c75c57a

Change-Id: Ib61dae6c30e90500aaec381a6eb5f7f7a82bc610
2019-06-17 05:49:13 -07:00
Ivan Podogov
72bb3cc1f6 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
am: 9a1c75c57a

Change-Id: Idf96f32733b5a3aedab325cbeba4b67c1d20ce24
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
Sunny Shao
d7d4a7ce6d Fixed the IllegalStateException on removing account
We display a dialog in AccountManager.removeAccountAsUser() callback, but at that
time fragment is onstop() which causes the IllegalStateException.

Fixes: 133253227
Fixes: 135004255
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
(cherry picked from commit d843ee85de)
2019-06-17 10:30:21 +00:00
Kevin Chyn
ad363b091f Merge "Update string for work profile face unlock" into qt-r1-dev am: 5d8cd009fa
am: 031affb92b

Change-Id: I96e9000612480acb44f7a8ec3c9c3c50d97075a8
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

Change-Id: I5f5cd08614bccf299ae153cf199bb9f466c4673b
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

Change-Id: Ib750883f7b0d3e634aa6b0bb5f2ea484748ac444
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

Change-Id: Iafbfb63497ff9b207bae3695ef1f660292e89804
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

Change-Id: I64cf3b8725efb8f8377e4f9dac545743066b2cbb
2019-06-14 17:11:54 -07:00