Commit Graph

55088 Commits

Author SHA1 Message Date
Andrew Sapperstein
722f8c0ac1 Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
am: 0c1f7da25a

Change-Id: I7e3ce8019cc4a411dec6ebf72b8518e1026ed73d
2019-06-28 10:47:58 -07:00
Andrew Sapperstein
bf29d2fce6 Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
am: 647f685063

Change-Id: I2e1f86871882063de4b4627e80c9327d2338b4e7
2019-06-28 10:43:13 -07:00
Andrew Sapperstein
647f685063 Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
2019-06-28 10:32:22 -07:00
Andrew Sapperstein
0c1f7da25a Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
2019-06-28 10:28:07 -07:00
Andrew Sapperstein
72aded338a Merge "Add UI for mainline modules licenses." into qt-dev 2019-06-28 16:56:04 +00:00
Yanting Yang
f1c2bf8c33 Fix RTL issue of Deferred Setup card
am: f6972b29b1

Change-Id: Ib90d60e14dce7a3bafec01170994485752dd632c
2019-06-28 07:34:11 -07:00
android-build-team Robot
0783aef666 Snap for 5694913 from 8d08713c96 to qt-c2f2-release
Change-Id: I3a22e7cdb16986099fa63ba0583deced159eecf3
2019-06-28 04:09:47 +00:00
Yanting Yang
f6972b29b1 Fix RTL issue of Deferred Setup card
Correct layout gravity to "start" to apply RTL layout.

Fixes: 131913172
Test: visual
Change-Id: I5935c5c1415070803141634ff4e92f1c65fc94f6
(cherry picked from commit c200df360c)
2019-06-28 00:17:32 +00:00
Winson Chung
010183bdcd Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
am: 8d08713c96

Change-Id: I565145cdcb2344737e2455ce819e831aefa8798f
2019-06-27 16:44:58 -07:00
Winson Chung
27424848e8 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
am: 8bf207bab6

Change-Id: I6461b114459160029df2caf8bfe86ad761cfd9be
2019-06-27 16:37:13 -07:00
Winson Chung
8bf207bab6 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77
2019-06-27 16:24:53 -07:00
Winson Chung
8d08713c96 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: I45e8c0e6e3caa9551646c0d26eac1a78a2fa56cd
2019-06-27 16:23: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
Evan Severson
1be07892a1 Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
am: f461d8dc52

Change-Id: I4729bdde26d5953839a623cd9ea483a387a5d901
2019-06-27 14:32:34 -07:00
Joel Galenson
d308c09d49 Remove Permissions Hub. DO NOT MERGE
am: 69d9899868

Change-Id: Id79ab681beaad7aca73d6f234b739470b85e19cd
2019-06-27 14:32:33 -07:00
Evan Severson
f461d8dc52 Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev 2019-06-27 21:21:56 +00:00
Amin Shaikh
cec55e7c2d Update Settings overlayed icons.
am: c477507f4e

Change-Id: I58e03056f7bd1f61b089c3fb60c17f8afc7a8488
2019-06-27 13:37:56 -07:00
Amin Shaikh
c477507f4e Update Settings overlayed icons.
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.

Bug: 131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Merged-In: Ib548c0b47db0064bcb1536c9b7a650912f28273f
2019-06-27 14:49:20 +00:00
android-build-team Robot
2624adca0a Snap for 5691653 from bfffb2ae74 to qt-c2f2-release
Change-Id: I531643b51b47e3055d9999462d56a8a1f35407f9
2019-06-27 03:12:40 +00:00
android-build-team Robot
a4b837a9eb Snap for 5691606 from 5a69fac694 to qt-release
Change-Id: I4d441da970e4d09a0e8878a87ccd26ed3438601e
2019-06-27 03:09:11 +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
Joel Galenson
69d9899868 Remove Permissions Hub. DO NOT MERGE
Bug: 132292477
Test: View all related screens.
(cherry picked from commit 1e7c172ad5)

This should have been submitted with ag/8109287
Bug: 136012133
Test: Clicked through permission screens on cuttlefish

Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970
2019-06-26 20:58:18 +00:00
markchien
0331222483 Fix entitlement failed when device is on CBRS
When active cellular internet is switched to CBRS in DSDS case,
default data sub id may not be changed. Fix by using active
subscription id and pass this sub id to entitlement app.

Bug: 134994718
Test: atest TetherServiceTest
Test: manual test with carrer SIMs.

Change-Id: I30a1d70c0690f0dba8f4171a2bde884f9b7ccfc4
2019-06-26 17:05:48 +00:00
Sunny Shao
1ae1523a91 Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
am: 27067657f2

Change-Id: I86a40d4016d185fee5f45e2bb69cbf0814d9fbeb
2019-06-26 04:44:02 -07:00
Sunny Shao
788093f3c8 Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
am: bfffb2ae74

Change-Id: Iac5fbc9c5486a7ea4db51bfc2cccc10cd8cd37e0
2019-06-26 04:43:25 -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
pastychang
f3b5f0adfe Fix status bar color of a11y doesn't apply stencil
View of content parent should not account for system screen decorations
and make statusbar layout can be overrided by stencil customization.

Bug: 126065441
Test: Manual
Change-Id: Iefbdc4a0613e1ae0b63c35769f1c8ec9581d7869
2019-06-26 19:36:08 +08: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
Sunny Shao
27067657f2 Merge "Fixed the IllegalStateException on removing account" into qt-dev
am: 5a69fac694

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