Commit Graph

54908 Commits

Author SHA1 Message Date
tmfang
73ff438a86 Add summary for white balance feature
Create a string id for summary.
This string should be empty string for AOSP.

Test: visual
Bug: 134790233
Change-Id: I06b5d0b35ac08565d3496f8559f5bd85cd56c6b8
2019-06-26 17:57:48 +08: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
8cfc709591 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am: 3288037bd2
am: fb52368873

Change-Id: I86d589bc1304c625da724c122dd083691fa46447
2019-06-25 23:11:15 -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
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
Bill Yi
72fd23590b [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: Ibe77e3e737a791657ce507dd56b5dc9f86de40e3
2019-06-25 22:20:09 -07:00
TreeHugger Robot
9905cc9b50 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-26 04:00:28 +00:00
android-build-team Robot
b66e3c854e Snap for 5687443 from 01d889815d to qt-c2f2-release
Change-Id: Ic1afb10db2381d8580489004e5c57c2e4dc37596
2019-06-26 03:08:27 +00:00
android-build-team Robot
6bc3af2b27 Snap for 5688376 from 87fadeeb4a to qt-release
Change-Id: Id06481c506e326dae5bcfdd3099126e9e8c511ff
2019-06-26 03:04:05 +00: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
818f9408a7 Merge "Adding slice for Face Enrollment" into qt-r1-dev
am: 35252d1b9f

Change-Id: I93e1619aed2080d9a08891e5d57c37b1a6423a7d
2019-06-25 18:53:40 -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

Change-Id: I08cb46d1752fcc5c317378c8838b39906ef9e389
2019-06-25 17:04:09 -07:00
Vishwath Mohan
c2ff8cc5a6 Change fingerprint reference to biometric for lockdown
am: 947a93ea75

Change-Id: I638ee2644283c20d5538ec3ed91266227b82044e
2019-06-25 17:01:31 -07:00
Andrew Sapperstein
56a8c33c1b Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.

Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.

Fixes: 135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
2019-06-25 16:01:38 -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
Bill Yi
2e96f10386 [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: I0d72ad4df778c60fc79b9a9ff213d999ba52dabb
2019-06-25 13:54:17 -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
732fb3c9d0 Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am: 87fadeeb4a
am: 48c61f173d

Change-Id: Id9d90c2d8c8b9362fc8d765626c3bf46413a651b
2019-06-25 12:02:56 -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
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
42e3d21967 [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: Idf035b9a914825a6ec86464bcdc500ede6569875
2019-06-25 09:12:11 -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
TreeHugger Robot
279050c8d6 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-25 14:46:00 +00:00
android-build-team Robot
cfd5c3010a Snap for 5686022 from 453222d6c6 to qt-c2f2-release
Change-Id: I95211e5cdd1710163daf831a0d6cccce56ba6574
2019-06-25 12:53:25 +00:00
android-build-team Robot
16e68e1bf7 Snap for 5685999 from 32d16291de to qt-release
Change-Id: I64f90b9c7fbb0a215d0210f4bcf293516591917c
2019-06-25 12:42:29 +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

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

Change-Id: Icda52879cb8f9478c3b68108b3699b13b0dfd80c
2019-06-24 18:03:10 -07:00
Mehdi Alizadeh
db97b3c755 Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am: 32d16291de
am: 453222d6c6

Change-Id: I3c60bffc1948bc4057199af031ada349fde3570e
2019-06-24 18:01:46 -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

Change-Id: I1e37f368a64f2a0abeab0e0141e20b6ae98b5b9d
2019-06-24 17:39:26 -07:00
Mehdi Alizadeh
5ea919fc4b Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am: 32d16291de

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

Change-Id: I8b5b41f3bd0c22d40c6670701fb4930bea7dd131
2019-06-24 14:33:48 -07:00
Hai Zhang
613188ca09 Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am: b39810f5ab
am: 636920da48

Change-Id: Id49a4f2fbf14b10951906d931ecdd5bac0311365
2019-06-24 14:33:18 -07:00