joshmccloskey
53ccc448c8
Using new Biometric API
...
Test: Verified disabling fingerprint will not allow
the user to unlock work apps with fingerprint. (But can use fingeprint
within apps.)
Test: Verified disabling face and/or iris on a fingerprint device will
continue to
allow the user to unlock work apps with fingerprint.
Test: Verified disabling face on a face authentication device
will not allow the user to unlock work apps with face authentication.
(But can use face
authentication within apps.)
Test: Verified disabling fingerprint and/or iris on a face
authentication device will continue to allow the user to unlock work
apps with face authentication.
Change-Id: I2f72a85f39ec539e6c6bc2cf710ed2f5ebeb5f9a
2019-12-18 16:18:31 -08:00
Automerger Merge Worker
93b2bfe37e
[automerger skipped] Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev am: 58bffb7f71
am: 1cd39a3fb9
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I195d0040944eae7bafc19fce92f39221765ea43b
2019-12-16 22:00:58 +00:00
Automerger Merge Worker
4b7a5135cb
[automerger skipped] [DO NOT MERGE] Add country blacklist support am: d4420d4ce4
am: 34c41cdadb
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3ec034c60a70fc78a92e5971d9f76604715f6c62
2019-12-16 22:00:14 +00:00
Automerger Merge Worker
1cd39a3fb9
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev am: 58bffb7f71
...
Change-Id: I2b25e18e176a7399ce4c7149a87b2014fceecb69
2019-12-16 21:55:09 +00:00
Automerger Merge Worker
34c41cdadb
[DO NOT MERGE] Add country blacklist support am: d4420d4ce4
...
Change-Id: I2924df987a2a0efc9e4f9f9f2e2fd838ed01f19d
2019-12-16 21:54:11 +00:00
Automerger Merge Worker
520c27cf72
[automerger skipped] Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev-plus-aosp am: 62487aed51
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If5d0a3eed0132307fe92e070d7554403baf76b9c
2019-12-16 21:53:34 +00:00
Alex Lin
58bffb7f71
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev
2019-12-16 21:34:45 +00:00
Alex Lin
62487aed51
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev-plus-aosp
2019-12-16 21:34:45 +00:00
Steven Liu
6c1efb0a80
Merge "Remove those stuff about CarrierAp, they are removed from FW."
2019-12-16 21:33:23 +00:00
Mehdi Alizadeh
84a23d37fb
Merge "New strings for the gesture navigation settings page"
2019-12-16 21:22:17 +00:00
Steve Elliott
da4a874d84
Merge "New toggle for peoplehub in Notification settings"
2019-12-16 16:41:46 +00:00
Automerger Merge Worker
79c698f801
Merge "[Settings] Remove access of TelecomManager.from()" am: 90544355cd
am: 0871f6bc97
am: 0419bccadc
...
Change-Id: I09b6f3bb2990d0b13c9cb58e4bfd7ad12d4178cd
2019-12-16 14:36:25 +00:00
Automerger Merge Worker
0419bccadc
Merge "[Settings] Remove access of TelecomManager.from()" am: 90544355cd
am: 0871f6bc97
...
Change-Id: I992dfff13cca63e070a74066a78b53fb8fefe01d
2019-12-16 14:23:54 +00:00
Bonian Chen
0871f6bc97
Merge "[Settings] Remove access of TelecomManager.from()"
...
am: 90544355cd
Change-Id: I4fe4009ffd33e2610d0c4bc8382ae8534c07a661
2019-12-16 06:12:53 -08:00
Treehugger Robot
90544355cd
Merge "[Settings] Remove access of TelecomManager.from()"
2019-12-16 13:04:24 +00:00
TreeHugger Robot
d04ad97133
Merge "Only show Condtionals when the feature flag is on."
2019-12-16 10:36:49 +00:00
Yi-Ling Chuang
9bda9af186
Only show Condtionals when the feature flag is on.
...
We plan to deprecate Settings Conditionals as it seems
duplicated with quick settings. For now, we set the default
value of this flag to false to disalbe it. OEMs could still
enalbe this feature by setting the flag on.
Bug: 142927361
Test: robotests
Change-Id: Ifaf710caf0045cb185b3a8c3b04f1ce537f67896
2019-12-16 17:13:21 +08:00
Jason Chiu
d955ebcd61
Merge "[Settings] Add preference click metric log"
2019-12-16 08:58:35 +00:00
Bonian Chen
3a96d214d3
[Settings] Remove access of TelecomManager.from()
...
Replace TelecomManager.from() into public API access.
Bug: 146187127
Test: build pass
Change-Id: Id9fa32063a9a7ea5b9107315e50330fa5eca41b7
2019-12-16 08:48:05 +00:00
Automerger Merge Worker
107cd136a3
Merge "[Settings] Adopting public API" am: 8ddd0da0a1
am: 40d2a2dd8d
am: 11fa77b023
...
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
2019-12-16 08:31:03 +00:00
Automerger Merge Worker
4b6ff82d92
Merge "[Setting] Code cleanup" am: 126df6441b
am: 9d556441b4
am: b4fd6cf8c9
...
Change-Id: Ic967dd59b017bd0e873ef8e65585745a6fad9875
2019-12-16 08:30:51 +00:00
Automerger Merge Worker
11fa77b023
Merge "[Settings] Adopting public API" am: 8ddd0da0a1
am: 40d2a2dd8d
...
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
2019-12-16 08:15:54 +00:00
Automerger Merge Worker
b4fd6cf8c9
Merge "[Setting] Code cleanup" am: 126df6441b
am: 9d556441b4
...
Change-Id: I956cb317ec98a5f6e9083b46f949451cf7e84613
2019-12-16 08:15:03 +00:00
Bonian Chen
40d2a2dd8d
Merge "[Settings] Adopting public API"
...
am: 8ddd0da0a1
Change-Id: I484a14670ee624624529f30af85ba0bfb06ae742
2019-12-16 00:05:51 -08:00
Bonian Chen
d230b552f5
Merge "[Settings] Unable to display disabled SIM (part 2)"
2019-12-16 08:05:17 +00:00
Bonian Chen
9d556441b4
Merge "[Setting] Code cleanup"
...
am: 126df6441b
Change-Id: I899c46a6b7df425a0ebfd22965c90bd304627edb
2019-12-16 00:03:22 -08:00
Bonian Chen
8ddd0da0a1
Merge "[Settings] Adopting public API"
2019-12-16 07:56:04 +00:00
Bonian Chen
126df6441b
Merge "[Setting] Code cleanup"
2019-12-16 07:26:48 +00:00
Bonian Chen
1247771b88
[Settings] Adopting public API
...
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.
Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
Jason Chiu
1281e595e4
[Settings] Add preference click metric log
...
- Move the log point of onPreferenceTreeClick from DashboardFragment to
it's super class InstrumentedPreferenceFragment for better coverage.
- Write the preference click metric log in PreferenceController handling
case in DashboardFragment which will skip super class's log point.
Bug: 137559984
Test: robotest
Change-Id: I67178f613c74f755e20fc9dc41319974cb02e83c
2019-12-16 10:57:09 +08:00
Bonian Chen
493dbc7aa7
[Setting] Code cleanup
...
Remove unused code.
Bug: 146309503
Test: build pass
Change-Id: I272ef1fa82877c8ac6b580fadd8d9baf1da2d5d4
2019-12-16 10:53:11 +08:00
tim peng
8e25a3a658
Merge "Apply new preference and controller for Bluetooth developer option"
2019-12-16 01:24:53 +00:00
TreeHugger Robot
02bb6e7e6e
Merge "Import translations. DO NOT MERGE"
2019-12-15 06:07:38 +00:00
Automerger Merge Worker
2c727d78d4
[automerger skipped] Import translations. DO NOT MERGE am: ee2c5a9df9
-s ours am: e18163b175
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I080a61ac059c393ec108e51d3d39d61a2c3696ff
2019-12-15 05:55:11 +00:00
Automerger Merge Worker
e18163b175
[automerger skipped] Import translations. DO NOT MERGE am: ee2c5a9df9
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I708fe77de9b914609d00b208c0b1d3851273f9be
2019-12-15 05:34:42 +00:00
Bill Yi
ee2c5a9df9
Import translations. DO NOT MERGE
...
Change-Id: I97d06e305b91ed0cffb8282e2610711d6c4d1d38
Auto-generated-cl: translation import
2019-12-13 21:28:00 -08:00
Bill Yi
d73afd6331
Import translations. DO NOT MERGE
...
Change-Id: I11894c2b8594e6104fcfe446d802af74b3c9d2a8
Auto-generated-cl: translation import
2019-12-13 20:32:18 -08:00
Automerger Merge Worker
7c01e8721c
[automerger skipped] Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a
am: 74a7a3cfb2
am: 00d32abf06
-s ours
...
am skip reason: skipped by user pinyaoting
Change-Id: I6c18c5c6ac66ef428d0709a2045d83a4ed3a8c14
2019-12-14 02:16:11 +00:00
Mehdi Alizadeh
d907169965
New strings for the gesture navigation settings page
...
Bug: 146004827
Test: It builds.
Change-Id: Ic8014cce1db5770b6adefb3537c9d223169ead14
2019-12-13 17:27:35 -08:00
Automerger Merge Worker
00d32abf06
Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a
am: 74a7a3cfb2
...
Change-Id: I02216936cd583e0a9a015287decdcb9f849ca45c
2019-12-14 01:23:03 +00:00
Automerger Merge Worker
4c9c8ee61a
[automerger skipped] Merge "[RadioInfo] Remove from Settings (into Telephony)" am: 0aac2dfab6
am: cfb6e23b21
am: cc63645bb2
-s ours
...
am skip reason: Change-Id Id62a2bf4b2c44efcd48319734d1cab6ed969ee06 with SHA-1 b7633cc59d
is in history
Change-Id: Ia1290cbbeed356e9181fd8be8c02534be3bfe562
2019-12-14 01:16:47 +00:00
Bonian Chen
74a7a3cfb2
Merge "Revert "[Setting] Cleanup Unused SimSettings""
...
am: 487c94c11a
Change-Id: I216047b915cbfb72eaf5de497709152fd8fee479
2019-12-13 17:09:45 -08:00
Automerger Merge Worker
cc63645bb2
Merge "[RadioInfo] Remove from Settings (into Telephony)" am: 0aac2dfab6
am: cfb6e23b21
...
Change-Id: I8c589476f6f365c2695bbacb026beebc4ea1c8db
2019-12-14 01:04:19 +00:00
Bonian Chen
487c94c11a
Merge "Revert "[Setting] Cleanup Unused SimSettings""
2019-12-14 01:01:38 +00:00
Bonian Chen
cfb6e23b21
Merge "[RadioInfo] Remove from Settings (into Telephony)"
...
am: 0aac2dfab6
Change-Id: I20d26fa821333648ce14bccac72f288fb6b9a99e
2019-12-13 16:51:40 -08:00
Bonian Chen
0aac2dfab6
Merge "[RadioInfo] Remove from Settings (into Telephony)"
2019-12-14 00:44:43 +00:00
Pinyao Ting
e6c023bed4
Revert "[Setting] Cleanup Unused SimSettings"
...
This reverts commit 0d9d341932
.
Reason for revert: Potential culprit for b/146229292 - verifying through Forrest before revert submission
Change-Id: I29a3ed1a44ea324e0fa88cda2e5baecb441f7922
2019-12-13 23:44:06 +00:00
Steve Elliott
bcfdbf4951
New toggle for peoplehub in Notification settings
...
Fixes: 146150828
Test: manual, atest
Change-Id: I7c21b81b1337ca0daf5b846f6ba9c7e6a239f09f
2019-12-13 20:47:18 +00:00
Ahmed ElArabawy
a53e186d50
Merge "Wifi: Replace dual_band with 5GHz band support"
2019-12-13 19:46:55 +00:00
Automerger Merge Worker
f71c419a0b
[automerger skipped] Merge "[Setting] Cleanup Unused SimSettings" am: 64b5882f9e
am: a9692bdf36
am: 14b406fd8f
-s ours
...
am skip reason: Change-Id I3f50e528eb409215371a125184502d3531bad0a8 with SHA-1 5cc9aad7a8
is in history
Change-Id: I259af559edd475f32b5c6c7b31538f289a9853b9
2019-12-13 18:17:47 +00:00