Joshua Mccloskey
0839185647
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
...
* changes:
Favor setup face in search settings.
Remove highlighting for work profile
2019-07-10 02:29:45 +00:00
Bill Yi
395393bf68
[automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours am: 49175304a4 -s ours
...
am: 3e66bd6c7e
2019-07-09 18:14:34 -07:00
Bill Yi
693137525e
[automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours am: 6edf1646c1 -s ours
...
am: d74b179378
2019-07-09 18:07:07 -07:00
Kevin Chang
4d609c0198
Merge "Add footer preference into caption preferences"
2019-07-10 01:05:31 +00:00
Bill Yi
3e66bd6c7e
[automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
...
am: 49175304a4
2019-07-09 17:41:57 -07:00
Bill Yi
d74b179378
[automerger skipped] Import translations. DO NOT MERGE am: 13d6e13166 -s ours
...
am: 6edf1646c1
2019-07-09 17:40:49 -07:00
Bill Yi
1f00145b19
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 41a7f9de31 -s ours
...
am: 77f1c50053
2019-07-09 17:31:22 -07:00
Bill Yi
6edf1646c1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:17:49 -07:00
Bill Yi
49175304a4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13d6e13166
2019-07-09 17:16:02 -07:00
Bill Yi
77f1c50053
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 41a7f9de31
2019-07-09 16:58:40 -07:00
TreeHugger Robot
8594380425
Merge "Set the max length of user name field in Profile info"
2019-07-09 23:54:29 +00:00
TreeHugger Robot
41a7f9de31
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-09 23:10:22 +00:00
joshmccloskey
582ac25006
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev am: 007a1aee1b
...
am: 235405d66e
2019-07-09 16:03:48 -07:00
joshmccloskey
235405d66e
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
...
am: 007a1aee1b
2019-07-09 15:51:45 -07:00
joshmccloskey
8bbbe545f2
Favor setup face in search settings.
...
Test: Manual.
Fixes: 137135217
Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e
2019-07-09 22:41:33 +00:00
Xin Li
f03ae69f69
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
...
Bug: 136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
2019-07-09 15:31:44 -07:00
TreeHugger Robot
007a1aee1b
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
2019-07-09 22:24:00 +00:00
joshmccloskey
85081a4f7e
Remove highlighting for work profile
...
Test: Manual.
Fixes: 137126517
Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc
2019-07-09 15:23:37 -07:00
Tarandeep Singh
54c2af9213
Remove usage of PER_PROFILE_IME_ENABLED property in settings
...
PER_PROFILE_IME_ENABLED is default enabled in Q. We no longer need to
have this property.
Bug: 135775619
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I1ba4fab361b77b1ec23b1773a66dccb76667e95c
2019-07-09 14:59:18 -07:00
TreeHugger Robot
9acfbdbe04
Merge "Avoid oem-unlock preference controller crash"
2019-07-09 21:00:04 +00:00
TreeHugger Robot
2ab371b13a
Merge "TODO about BatteryStats.STATS_SINCE deprecation"
2019-07-09 19:41:54 +00:00
Bill Yi
43682f3f27
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I84335ed2cdca77f9f506c084b11c5bb3215dd05f
2019-07-09 12:31:21 -07:00
joshmccloskey
97a95798ac
Diversity extra no longer gets overwritten.
...
Test: Manual.
Fixes: 136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
2019-07-09 18:59:20 +00:00
Bill Yi
13d6e13166
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
2019-07-09 11:46:23 -07:00
TreeHugger Robot
d9f680fc92
Merge "[Wi-Fi DPP] Add a parent class for WifiDppConfiguratorActivity and WifiDppEnrolleeActivity"
2019-07-09 11:15:28 +00:00
TreeHugger Robot
4cafc50ea4
Merge "Update Settings Owners"
2019-07-09 10:45:33 +00:00
Jason Chiu
ca2bbc0685
Set the max length of user name field in Profile info
...
Settings may crash when entering a very long user name.
Fixes: 136005061
Test: manual, robotest
Change-Id: Ica17297588fc6b84ef111ef00017afb27360acd3
2019-07-09 18:25:51 +08:00
Mill Chen
6f3b222ca5
Clean up in-code preference controllers from accessibility
...
Bug: 135056871
Test: manual, robotests
Change-Id: I0c1358657d3f57ddae2b8f2b12ee610e7363f41f
2019-07-09 17:35:32 +08:00
Arc Wang
1df7f2d1c1
[Wi-Fi DPP] Improve TalkBack information for events
...
Title and summary may be changed after user operations or Wi-Fi Easy connect handshake,
setAccessibilityLiveRegion could specify accessibility services to announce these changes.
In WifiDppAddDeviceFragment, I set title before summary for correct TalkBack announce sequence.
Bug: 137069941
Test: manual
Change-Id: Id032cfcb86c350feeac808f070665ac26261ceb8
2019-07-09 17:30:01 +08:00
Mill Chen
e8bb058d14
Avoid oem-unlock preference controller crash
...
Openning developer options will crash if the device doesn't support
oem_unlock module. We added a condition to check that the
oem_unlock_supported property is existing before getting OemLockManager.
Fixes: 136108893
Test: robotests
Test: lunch aosp_cf_x86_phone-eng; m dist; acloud create --local-image
Test: lunch sdk_gphone_x86-eng; make; emulator
Change-Id: I2c1821fbdd18e3e8162a492e1e15dd34c8aec803
2019-07-09 16:52:22 +08:00
Fan Zhang
496fa956ef
Update Settings Owners
...
Test: rebuilt
Change-Id: I44a45aa407df0ccd45235a5f2a540d43a8ba2f59
2019-07-09 00:44:59 -07:00
TreeHugger Robot
68aa24d365
Merge "Make Sensors tile icon support dark theme."
2019-07-09 05:40:40 +00:00
TreeHugger Robot
33c8c8e4a2
Merge "[Wi-Fi DPP] remove unused code"
2019-07-09 03:36:42 +00:00
Yi-Ling Chuang
397abecae8
Make Sensors tile icon support dark theme.
...
Tint the icon based on the current theme.
Fixes: 135171803
Test: visual
Change-Id: I0885d165fd98b07cf61dec48c281c38a47d91e50
2019-07-09 10:33:40 +08:00
Curtis Belmonte
c29bf8d9cc
Fix work account setup lock screen content for face auth am: 5604585930
...
am: 209c049dca
2019-07-08 17:30:53 -07:00
Curtis Belmonte
209c049dca
Fix work account setup lock screen content for face auth
...
am: 5604585930
2019-07-08 17:10:55 -07:00
android-build-team Robot
ec58694ae8
Snap for 5622519 from fd365ae91e to pi-platform-release
...
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
2019-07-08 23:29:58 +00:00
Curtis Belmonte
5604585930
Fix work account setup lock screen content for face auth
...
For devices which provide biometric authentication options, such as
fingerprint or face, we should be showing different content on the lock
setup screen during the corp account setup wizard. Namely, the title
should read "Choose screen lock", and the "Not now" option should be
changed to "Continue without [auth method]". However, we currently only
check for whether fingerprint authentication is available, leading to
incorrect text for devices with face authentication.
This CL fixes the issue by changing the introducing a private method to
check for any biometric authentication (currently just mForFingerprint ||
mForFace). It then uses this method in place of the existing
mForFingerprint checks in SetupChooseLockGeneric.
Test: On a device with fingerprint auth and one with face auth:
1. Set a work profile with TestDPC and add some password quality requirement
2. adb shell settings put global device_provisioned
3. adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
4. Verify that the correct content is now shown (screenshot/xZPVtpa3j3Z)
5. Verify that setting lock with and without biometric auth still works
Fixes: 136556653
Change-Id: I46d3c964f05986aa97cc8ed77fe0ac125337ddd0
2019-07-08 19:03:56 +00:00
Arc Wang
2d211208d6
[Wi-Fi DPP] remove unused code
...
Bug: 120645817
Test: atest com.android.settings.wifi.dpp
Change-Id: I467888de0efe8ae663863e9eacc15e77d32487d2
2019-07-08 18:23:56 +08:00
Arc Wang
91c3146b48
[Wi-Fi DPP] Add a parent class for WifiDppConfiguratorActivity and WifiDppEnrolleeActivity
...
To reduce duplicate code.
Bug: 129305770
Test: atest com.android.settings.wifi.dpp
Change-Id: I3046c7d6dd7159a9a7dd7766370a65c0f5b3150e
2019-07-08 17:36:18 +08:00
TreeHugger Robot
c9197ed237
Merge "Import translations. DO NOT MERGE"
2019-07-06 03:32:37 +00:00
Bill Yi
8e2bf7ed8c
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours am: ce4d5fbff9 -s ours
...
am: 34cf96e241
2019-07-05 19:23:32 -07:00
Bill Yi
7646dcd383
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours am: 2759932e72 -s ours
...
am: f169d0de87
2019-07-05 19:22:56 -07:00
Android Build Merger (Role)
34cf96e241
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours am: ce4d5fbff9 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-06 02:14:07 +00:00
Bill Yi
bbc3b2d55f
[automerger skipped] Import translations. DO NOT MERGE am: bad6060727 -s ours
...
am: cd3a5441b6
2019-07-05 19:13:54 -07:00
Bill Yi
bb0b72a1d9
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours
...
am: ce4d5fbff9
2019-07-05 19:13:54 -07:00
Bill Yi
f169d0de87
[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours
...
am: 2759932e72
2019-07-05 19:13:53 -07:00
Bill Yi
2759932e72
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
ce4d5fbff9
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
cd3a5441b6
[automerger skipped] Import translations. DO NOT MERGE
...
am: bad6060727
2019-07-05 19:04:54 -07:00
