Commit Graph

24983 Commits

Author SHA1 Message Date
TreeHugger Robot
917ed5e70a Merge "Fix a NPE from incorrect assumption of operation pecedence." 2019-02-01 02:19:35 +00:00
TreeHugger Robot
374495a865 Merge "Remove unused dependency" 2019-02-01 01:25:19 +00:00
Fan Zhang
b617f84b32 Fix a NPE from incorrect assumption of operation pecedence.
Change-Id: I13d01c39bd3afcfbc7b680b96e0c7eb341fbc584
Fixes: 123709444
Test: robotest
2019-01-31 13:59:50 -08:00
Vishwath Mohan
8e268830f2 Merge "Allow multiple trust agents" 2019-01-31 20:21:40 +00:00
Vishwath Mohan
7d93d8bcdc Allow multiple trust agents
This CL is essentially a one-line change that sets the
ONLY_ONE_TRUST_AGENT boolean to false.

Bug: 111431046
Test: Tested manually that this works correctly

Change-Id: Ia8f06235467e3223ef1e441a62d941a64a2d7c93
2019-01-31 20:19:32 +00:00
TreeHugger Robot
cf1bd41cc4 Merge "Remove dead code from settings" 2019-01-31 19:18:17 +00:00
TreeHugger Robot
3865c7d6c5 Merge "Connect to network while clicking open or saved networks on slice" 2019-01-31 19:14:05 +00:00
Alex Salo
962a7ec22d Remove unused dependency
Test: not needed
Bug: 111939367
Change-Id: Id6040240e6221fe6311b7985f3763c04989be7d2
2019-01-31 18:20:16 +00:00
Christine Franks
877a9a058b Merge "Use ColorDisplayManager for night display settings" 2019-01-31 17:45:45 +00:00
TreeHugger Robot
83ef324e1d Merge "If the ramping ringer adaptive volume is enabled then do not show this setting. It will be injected from settings intelligence with additional user options" 2019-01-31 06:18:30 +00:00
TreeHugger Robot
3aee53b7ce Merge "Consolidate wake-screen settings page" 2019-01-31 05:30:10 +00:00
Tajinder Gadh
eb1aa063ed If the ramping ringer adaptive volume is enabled then do not show
this setting. It will be injected from settings intelligence with
additional user options

Test: Build locally and validated
Change-Id: I6f79eea460e86d643d92c04e8ea126b99b9bed8b
2019-01-31 03:48:46 +00:00
Soonil Nagarkar
139644bb0e Remove dead code from settings
Test: manually
Change-Id: I1ef0bb2a20c6c6f020dd051407dda2de87f174ea
2019-01-30 17:15:54 -08:00
Pengquan Meng
7f602c7f67 Add enable/disable DSDS setting switch
This add a switch settings in the Phone Information screen to allow the
user enable/disable the DSDS mode.

Bug: 123088078
Test: build & manual test
Change-Id: Ia3722fb26ce8825820ee96550a1d523da35c7a71
2019-01-30 16:42:02 -08:00
TreeHugger Robot
1566e71c73 Merge "Add feature flag check for mainline module version." 2019-01-31 00:38:07 +00:00
Lucas Dupin
b55e5f1360 Consolidate wake-screen settings page
UX decided to have a single settings page instead of two

Test: manual
Bug: 111414690
Change-Id: I8e0eee3ea00b1eb9cbe534cc60bfccec43cf8e31
2019-01-30 15:06:14 -08:00
TreeHugger Robot
6b3db61e53 Merge "Use role for App info default phone shortcut." 2019-01-30 22:23:40 +00:00
Doris Ling
f5fd5c4985 Add feature flag check for mainline module version.
- in about phone settings, only show the mainline module version if the
feature is enabled.

Bug: 122615240
Test: make RunSettingsRoboTests
Change-Id: If872859755dade7e601a47eb387d10c3b247d06e
2019-01-30 12:52:23 -08:00
Fan Zhang
a0a2e72ca6 Merge "Revert "Add live caption preference in accessibility page."" 2019-01-30 20:14:22 +00:00
Ruchi Kandoi
dd9b61278b Merge "Add Secure NFC functionality" 2019-01-30 18:58:50 +00:00
TreeHugger Robot
d89332b8c8 Merge "Add referrer when launching search intent." 2019-01-30 18:57:28 +00:00
Fan Zhang
fa27a88292 Revert "Add live caption preference in accessibility page."
This reverts commit d64901494f.

Reason for revert: b/123636344

Change-Id: If6307935ba3613cb24f5bab2234febef83c6f7d2
2019-01-30 18:10:17 +00:00
Chandan Nath
e0dde6a6cd Merge "[Multi-user] Change Backup Settings page to support multi-user." 2019-01-30 14:03:38 +00:00
Julia Reynolds
6d905451bf Merge "Add silent status bar icon setting" 2019-01-30 13:41:08 +00:00
TreeHugger Robot
e8cb8779e7 Merge "Fix crash if timezone is changed and "Don't keep activities" mode is on" 2019-01-30 10:59:36 +00:00
Oscar Shu
910eca86b9 Merge "Revert "Wifi MAC Randomization: Developer Options"" 2019-01-30 10:55:34 +00:00
Jason Chiu
da2ca2f092 Connect to network while clicking open or saved networks on slice
Test: make RunSettingsRoboTests -j
Fixes: 121342770
Change-Id: I0ffb925628dd271d054f990b9b176eb10372e6a3
2019-01-30 16:15:41 +08:00
TreeHugger Robot
f660e72009 Merge "Remove empty space in Usage access" 2019-01-30 07:04:25 +00:00
TreeHugger Robot
27bbfb73f5 Merge "Wi-Fi DPP code refine" 2019-01-30 05:00:38 +00:00
TreeHugger Robot
2fd04a9fb5 Merge "ConfirmDeviceCredential should default to setRequireConfirmation(true)" 2019-01-30 04:49:37 +00:00
TreeHugger Robot
d47c73549b Merge "Use settingslib ActionBarShadowController" 2019-01-30 04:29:44 +00:00
TreeHugger Robot
e798c07827 Merge "Schematize Crypto system properties" 2019-01-30 03:51:31 +00:00
Les Lee
3826f5ec42 Merge "Use API to get necessary value when activity init" 2019-01-30 03:42:55 +00:00
TreeHugger Robot
c5a42cc528 Merge "Remove dead code." 2019-01-30 03:22:09 +00:00
Roshan Pius
04dd29fc38 Merge "AccessPoint: App attribution for suggestion/specifier" 2019-01-30 03:03:20 +00:00
Kevin Chyn
440afb8868 ConfirmDeviceCredential should default to setRequireConfirmation(true)
If the value is unset, we should maintain the same default behavior
as BiometricPrompt, which is to dfeault to requiring confirmation.

Fixes: 123598496

Test: manual
Change-Id: Icaf27d184e0aea5eee077b8ec14bca27fd0ddad3
2019-01-29 18:35:53 -08:00
Arc Wang
3dc845a181 Merge "Set Wi-Fi DPP fragment icons." 2019-01-30 02:29:35 +00:00
Daniel Sandler
30f0643c9e Merge "Fix dsandler's email address." 2019-01-30 02:09:54 +00:00
Julia Reynolds
c04425fe38 Add silent status bar icon setting
Test: atest
Bug: 123419917
Change-Id: I40fe580b76589c45a70365c09a966a76b5bc882b
2019-01-30 00:41:51 +00:00
Ruchi Kandoi
5bf4e1ec4f Add Secure NFC functionality
Secure NFC will permit NFC acitvity only when screen
is unlocked.

Bug: 117253725
Test: Manual; Toggle switch; check if HCE works with screen off
Change-Id: I9977d85065fc7ebca3ed4991ffa52fef0590cf90
2019-01-29 16:33:46 -08:00
Fan Zhang
c3fd289969 Remove dead code.
Bug: n/a
Test: rebuild
Change-Id: I71f8d9d99bbff1186e8df518ec8d27db3447ffbe
2019-01-29 16:27:31 -08:00
Fan Zhang
1107d310f1 Use settingslib ActionBarShadowController
Change-Id: Ib70a0ca307bb98e576f2c3deb8f7aea88e59b10e
Fixes: 123311100
Test: robotests
2019-01-29 15:39:32 -08:00
TreeHugger Robot
3a7cbacdcd Merge "Fix padding problem between search bar and homepage cards" 2019-01-29 23:00:18 +00:00
Fan Zhang
beedd3abe5 Add referrer when launching search intent.
Bug: 123294739
Test: robotests
Change-Id: I600abf1d764e828d52f3b8d35ad24cdc94dfba01
2019-01-29 14:10:05 -08:00
TreeHugger Robot
a0690b3d2e Merge "Add a plus button to the mobile pref on Network & internet page" 2019-01-29 22:08:33 +00:00
Antony Sargent
59adc31773 Add a plus button to the mobile pref on Network & internet page
On the Network & internet page, we have a "Mobile network" pref that in
single-SIM mode leads to a detail page for the current SIM. In multi-SIM
mode it has more complicated behavior (leading either to details about
the current subscription if there is only one, or a list of
subscriptions if more than one).

One of the things we wanted to add was a shortcut to add another eSIM
subscription. So this CL adds a plus button control on the right of the
preference which leads to a flow to add another mobile subscription via
the eSIM manager.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I38e0031e3bd603e93c45dcb4557750e7bc1b8b5a
2019-01-29 12:27:46 -08:00
Dan Sandler
3d0078766d Fix dsandler's email address.
Test: dsandler can give OWNERS approval again
Change-Id: I8a59453ec95b98ce74703bbe003c9039e2a96f22
2019-01-29 14:41:54 -05:00
Yanting Yang
a55909f812 Merge "Sort notification channel in NotificationChannelSlice" 2019-01-29 16:44:12 +00:00
Nikita Iashchenko
8db2d30fab Fix crash if timezone is changed and "Don't keep activities" mode is on
The issues is that TimeZoneData is being loaded with LoaderManager on
every fragment's onCreate(). At the same time this fragment has
onActivityResult() handler that accesses TimeZoneData and relies on the
fact that it has been already initialized prior this call. So when you
enable "Don't keep activities" mode, the TimeZoneSettings fragment [1]
that holds TimeZoneData is immediately destroyed after launching time zone
picker fragment [2] (which result [1] waits for), and when android calls
onActivityResult() for [1] (after time zone has been picked in [2]),
Android has to recreate [1] from scratch. So you get onCreate() called and
immidiately after that onActivityResult() called, and at this point we get
the crash, because the loader hasn't finished yet and onActivityResult()
tries to access uninitialized mTimeZoneData.

This CL fixes this crash issue by postponing
mTimeZoneData.lookupCountryTimeZones call until mTimeZoneData is loaded
by loader. It is done through saving data intent in onActivityResult()
and calling onZonePickerRequestResult() when time zone data is loaded.

Bug: 112351583
Test: m Settings droid successfully builds, manual testing with "Don't
keep activities" mode enabled

Change-Id: Id30d36dc17a0de96ba871f9d0f4a2686479d0eeb
2019-01-29 15:22:56 +00:00
TreeHugger Robot
79d5428c8b Merge "Enable overlays on background thread." 2019-01-29 14:58:37 +00:00