Winson Chung
27424848e8
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
...
am: 8bf207bab6
2019-06-27 16:37:13 -07:00
Winson Chung
8bf207bab6
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
...
am: 9591c3f963
2019-06-27 16:24:53 -07:00
Winson Chung
9591c3f963
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
2019-06-27 22:47:14 +00:00
Louis Chang
397cdd6ead
Adding unique task affinity for FallbackHome activity
...
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.
Bug: 135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
2019-06-27 09:57:54 +08:00
Sunny Shao
1ae1523a91
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
...
am: 27067657f2
2019-06-26 04:44:02 -07:00
Sunny Shao
e4310ea096
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
...
am: bfffb2ae74
2019-06-26 04:43:25 -07:00
Sunny Shao
27067657f2
Merge "Fixed the IllegalStateException on removing account" into qt-dev
...
am: 5a69fac694
2019-06-26 04:35:26 -07:00
Sunny Shao
bfffb2ae74
Merge "Fixed the IllegalStateException on removing account" into qt-dev
...
am: 5a69fac694
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
Antony Sargent
dd3a072ce6
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
...
am: fb52368873
2019-06-25 23:11:46 -07:00
Antony Sargent
85a2cd23f7
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
...
am: e4e1f08781
2019-06-25 23:11:15 -07:00
Antony Sargent
e4e1f08781
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
...
am: 3288037bd2
2019-06-25 23:02:14 -07:00
Antony Sargent
fb52368873
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
...
am: 3288037bd2
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
9e8e6dffa0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 9905cc9b50
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
ef3d1939c8
Merge "Adding slice for Face Enrollment" into qt-r1-dev
...
am: 35252d1b9f
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
f035e6212b
Change fingerprint reference to biometric for lockdown
...
am: 947a93ea75
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
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
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
d7c09b1a65
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
...
am: 48c61f173d
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
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
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
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
eb1a0a85b9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6 -s ours
...
am: a5830871e2
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
2019-06-25 09:14:42 -07:00
Bill Yi
a5830871e2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 279050c8d6
2019-06-25 08:57:36 -07:00
Bill Yi
dbe1a25abd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 279050c8d6
2019-06-25 08:57:36 -07:00
TreeHugger Robot
279050c8d6
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-25 14:46:00 +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
Android Build Merger (Role)
57e695fe63
Merge "Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de am: 453222d6c6" into qt-r1-dev-plus-aosp
2019-06-25 01:06:07 +00:00
Mehdi Alizadeh
02fcd11b40
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
...
am: 5ea919fc4b
2019-06-24 18:03:44 -07:00
Mehdi Alizadeh
ac5b6a3fde
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
...
am: 453222d6c6
2019-06-24 18:03:10 -07:00
joshmccloskey
6634c159fd
Adding slice for Face Enrollment
...
Fixes: 134965754
Test: Verified slice appears when not enrolled.
Test: Verified slice does not appear when enrolled.
Test: Verified slice disappears after clicking on icon and going back
to settings page.
Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843
2019-06-24 17:41:36 -07:00
Mehdi Alizadeh
453222d6c6
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
...
am: 32d16291de
2019-06-24 17:39:26 -07:00
Mehdi Alizadeh
5ea919fc4b
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
...
am: 32d16291de
2019-06-24 17:36:26 -07:00
Mehdi Alizadeh
32d16291de
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
2019-06-25 00:09:06 +00:00
Hai Zhang
3df0b5072c
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 636920da48
2019-06-24 14:33:48 -07:00
Hai Zhang
3603e24840
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
...
am: 5f8c446f47
2019-06-24 14:32:28 -07:00
Hai Zhang
636920da48
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
...
am: b39810f5ab
2019-06-24 14:28:54 -07:00
Hai Zhang
5f8c446f47
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
...
am: b39810f5ab
2019-06-24 14:28:54 -07:00
TreeHugger Robot
b39810f5ab
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
2019-06-24 21:19:17 +00:00
Hai Zhang
71f2614736
Revert "Add special apps access settings page for financial app."
...
This reverts commit 43374eabb8
2019-06-24 21:11:36 +00:00
Mehdi Alizadeh
0c7fd9e406
Adds metrics categories for gesture navigation dialogs
...
Bug: 135211145
Test: Builds
Change-Id: I9231778072bb222142fca09275cd84b87a263fa6
2019-06-24 20:29:41 +00:00
