Sunny Shao
c15fd54810
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
am: bfffb2ae74
...
am: e4310ea096
Change-Id: I51ee1d27e136d2e5be4ecfa29892125debefe80c
2019-06-26 04:51:29 -07:00
Sunny Shao
e4310ea096
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
...
am: bfffb2ae74
Change-Id: I51cbaf932b7dac50a2fd246d47f3fb69cd421c27
2019-06-26 04:43:25 -07:00
Sunny Shao
bfffb2ae74
Merge "Fixed the IllegalStateException on removing account" into qt-dev
...
am: 5a69fac694
Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209
2019-06-26 04:35:26 -07:00
TreeHugger Robot
5a69fac694
Merge "Fixed the IllegalStateException on removing account" into qt-dev
2019-06-26 11:15:35 +00:00
TreeHugger Robot
01823a53af
Merge "Separate disable animations preference controller from accessibility"
2019-06-26 08:42:03 +00:00
TreeHugger Robot
d5888bbf84
Merge "Separate a11y timeout preference controller from accessibility"
2019-06-26 08:38:11 +00:00
Mill Chen
223bf1b520
Separate a11y timeout preference controller from accessibility
...
Bug: 135056871
Test: manual, robotest
Change-Id: I00d40451b40c0a4d5e214b23d78139195d98e42b
2019-06-26 15:10:04 +08:00
Mill Chen
d2deb850d3
Separate disable animations preference controller from accessibility
...
Bug: 135056871
Test: manual, robotests
Change-Id: I14f322d91179779f2d758c58a2ed729efc0b45f5
2019-06-26 14:58:44 +08:00
Antony Sargent
20b2f8ab50
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
am: fb52368873
...
am: dd3a072ce6
Change-Id: I7c2d2b76ac9cfb863d315401b7665885973a1038
2019-06-25 23:20:29 -07:00
Antony Sargent
8abc3d914d
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
am: e4e1f08781
...
am: 85a2cd23f7
Change-Id: I9b1c25d6b2a0ad36aee5134db0d831f640f97bf8
2019-06-25 23:19:13 -07:00
Antony Sargent
dd3a072ce6
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
...
am: fb52368873
Change-Id: Ib5a9f6d77ce599c8f0892c78fdd49105e0fc7fdd
2019-06-25 23:11:46 -07:00
Antony Sargent
85a2cd23f7
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
...
am: e4e1f08781
Change-Id: I5142d6a71e16dca999c4370ab65a371d90563aed
2019-06-25 23:11:15 -07:00
Antony Sargent
fb52368873
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
...
am: 3288037bd2
Change-Id: I5833f9ece2590b16ef3184f8d315fd092f683207
2019-06-25 23:02:14 -07:00
Antony Sargent
e4e1f08781
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
...
am: 3288037bd2
Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f
2019-06-25 23:02:14 -07:00
TreeHugger Robot
3288037bd2
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
2019-06-26 05:35:29 +00:00
Bill Yi
daec0749c3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 9905cc9b50
-s ours
...
am: 9e8e6dffa0
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic9cc8b30718cac28df42090d4ddff0010b5953a6
2019-06-25 22:30:15 -07:00
Bill Yi
9e8e6dffa0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 9905cc9b50
-s ours
am skip reason: subject contains skip directive
Change-Id: I62d2bdcc5dbdb6dcdc38184e063d9825a6b1c5cc
2019-06-25 22:22:11 -07:00
TreeHugger Robot
9905cc9b50
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-26 04:00:28 +00:00
Joshua Mccloskey
c4f18bb77c
Merge "Adding slice for Face Enrollment" into qt-r1-dev am: 35252d1b9f
...
am: ef3d1939c8
Change-Id: I3c3b28e6ac2e67a588f970d8eae706390f666bc1
2019-06-25 19:31:34 -07:00
Joshua Mccloskey
ef3d1939c8
Merge "Adding slice for Face Enrollment" into qt-r1-dev
...
am: 35252d1b9f
Change-Id: Ic36d9fd8f00b01fe4c35e005cd9192b9cfe900e9
2019-06-25 18:58:54 -07:00
Joshua Mccloskey
35252d1b9f
Merge "Adding slice for Face Enrollment" into qt-r1-dev
2019-06-26 01:15:50 +00:00
Vishwath Mohan
4964ad847e
Change fingerprint reference to biometric for lockdown am: 947a93ea75
...
am: f035e6212b
Change-Id: I66a03fb04f0d2b6c1f9eb91f4360f840f0c54407
2019-06-25 17:20:35 -07:00
Vishwath Mohan
f035e6212b
Change fingerprint reference to biometric for lockdown
...
am: 947a93ea75
Change-Id: I08cb46d1752fcc5c317378c8838b39906ef9e389
2019-06-25 17:04:09 -07:00
Bill Yi
a311a7f16f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 134640169
Change-Id: Ifd9077857dbae28a18cf494a4c318669ec2b1519
2019-06-25 15:43:36 -07:00
Bill Yi
ce9197b1c0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 01d889815d
-s ours
...
am: f6fd739942
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie174a01aafefb1e84e422ea360ed61f05f5eac62
2019-06-25 14:28:05 -07:00
Antony Sargent
46d819272a
Check isWfcProvisionedOnDevice in WifiCallingSettings
...
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.
The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.
What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.
The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.
As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.
Fixes: 135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
2019-06-25 14:16:53 -07:00
Vishwath Mohan
947a93ea75
Change fingerprint reference to biometric for lockdown
...
Changes the lockdown description to reference biometric unlocks more
generally, and not just fingerprint unlock.
Bug: 135282412
Test: The string for lockdown does not refer to fingerprint
Change-Id: I8f1cf43bc8d42288d96a272b3243a7863c8d4941
2019-06-25 20:41:58 +00:00
Bill Yi
f6fd739942
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 01d889815d
-s ours
am skip reason: subject contains skip directive
Change-Id: I27937e9386711f9d177e23aff8ac382b0e26c794
2019-06-25 13:36:27 -07:00
TreeHugger Robot
01d889815d
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-25 19:24:19 +00:00
Antony Sargent
8532344531
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
am: 48c61f173d
...
am: d7c09b1a65
Change-Id: I63c7402a440d21777a297982da73ee755a8459f4
2019-06-25 12:19:38 -07:00
Antony Sargent
2bb3578876
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
am: bc50fb8aef
...
am: 6a8d5e03db
Change-Id: I136f4f87d941a0c97c5c2035ade95721ffc490e5
2019-06-25 12:14:40 -07:00
Antony Sargent
d7c09b1a65
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: 48c61f173d
Change-Id: I785164c77bcd6377db2a50ebeaafca40a89454c7
2019-06-25 11:55:57 -07:00
Antony Sargent
6a8d5e03db
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: bc50fb8aef
Change-Id: I616fd98109f8bd80c48f7ba0641b9219a3b00a30
2019-06-25 11:52:57 -07:00
Antony Sargent
48c61f173d
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
...
am: 87fadeeb4a
Change-Id: Ib32dca04f573f3d84f77215c5ab891cb873072af
2019-06-25 11:44:50 -07:00
Antony Sargent
bc50fb8aef
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
...
am: 87fadeeb4a
Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed
2019-06-25 11:40:48 -07:00
TreeHugger Robot
87fadeeb4a
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
2019-06-25 17:54:54 +00:00
Bill Yi
1f064f21bc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6a0682180e39156f0959521d47ec707c8da28819
2019-06-25 10:33:04 -07:00
Bill Yi
ab8af8fd8f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6
-s ours am: a5830871e2
-s ours
...
am: eb1a0a85b9
-s ours
am skip reason: subject contains skip directive
Change-Id: Ife42f37f66f10581c4cf78cd8fb83b68f1c924bf
2019-06-25 09:42:00 -07:00
Bill Yi
c404028b57
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6
-s ours am: dbe1a25abd
-s ours
...
am: d76daeedba
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic2fbc017f4200a63ca7c38b6a60b434072d421f5
2019-06-25 09:39:47 -07:00
Bill Yi
eb1a0a85b9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6
-s ours
...
am: a5830871e2
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifcccedff3162831dfa7c14f16de8fe9b3e1bb9c9
2019-06-25 09:21:47 -07:00
Bill Yi
d76daeedba
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6
-s ours
...
am: dbe1a25abd
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaac85b2aa472e3a45e9194a354b58a702d5b0b82
2019-06-25 09:14:42 -07:00
Bill Yi
a5830871e2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 279050c8d6
-s ours
am skip reason: subject contains skip directive
Change-Id: I60113754c64466c9729ef69156de47efcf8f775c
2019-06-25 08:57:36 -07:00
Bill Yi
dbe1a25abd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 279050c8d6
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a
2019-06-25 08:57:36 -07:00
Raff Tsai
50fca4ccdb
Merge "Fix cannot switch between multiple TTS engines"
2019-06-25 15:32:15 +00:00
TreeHugger Robot
279050c8d6
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-25 14:46:00 +00:00
TreeHugger Robot
28b1277992
Merge "Use FooterPreference in xml explicitly"
2019-06-25 11:39:32 +00:00
Bill Yi
fe1b808001
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
2019-06-25 04:07:28 -07:00
Mehdi Alizadeh
02d06dd79c
Merge "Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
am: 453222d6c6" into qt-r1-dev-plus-aosp
...
am: 57e695fe63
Change-Id: Ibc952410534f3b53094d6ea70b0d9b9c20b8f856
2019-06-25 02:22:56 -07:00
Mehdi Alizadeh
cee5585b00
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
am: 5ea919fc4b
...
am: 02fcd11b40
Change-Id: I95dc2cae26812f27c6f1a32a75d410c97aa363a2
2019-06-25 02:12:57 -07:00
tmfang
ec83f48e0d
Use FooterPreference in xml explicitly
...
We don't rely on FooterPreferenceMixinCompat
to create footer preference in dashboard fragment.
Instead, declare a FooterPreference explicitly in
xml of screen.
Test: visual, robotest
Bug: 124129485
Change-Id: I4c5b60c3926583eb0d9f0d4cd6996bf169d6408c
2019-06-25 16:48:51 +08:00