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
TreeHugger Robot
007a1aee1b
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
2019-07-09 22:24:00 +00: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
joshmccloskey
97a95798ac
Diversity extra no longer gets overwritten.
...
Test: Manual.
Fixes: 136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
2019-07-09 18:59:20 +00: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
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
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
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
Bill Yi
2759932e72
[automerger skipped] Import translations. DO NOT MERGE
...
am: 292e7ad110
2019-07-05 19:04:54 -07:00
Bill Yi
bad6060727
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9933f3eb0721fab73ff7776324de6ce088469a67
2019-07-05 16:53:24 -07:00
Bill Yi
292e7ad110
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
2019-07-05 14:38:28 -07:00
Bill Yi
9471cb6e89
Import translations. DO NOT MERGE
...
Change-Id: I268be769ac7d65c7b87eed1067afa963c9fe62f7
Auto-generated-cl: translation import
2019-07-05 12:23:56 -07:00
TreeHugger Robot
aa05d1d780
Merge "Fix robolectric test error"
2019-07-05 09:53:37 +00:00
TreeHugger Robot
9848b293b0
Merge "Add margin between password entry and error text"
2019-07-05 07:52:56 +00:00
Raff Tsai
4d70be899d
Fix robolectric test error
...
Fixes: 136778642
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.deviceinfo"
Change-Id: I55591ec44397c39e71de7503c37ec84bbc17bfb1
2019-07-05 15:06:32 +08:00
Raff Tsai
e8bd78e212
Add margin between password entry and error text
...
Fixes: 130664317
Test: visual
Change-Id: Iefdbd39b94a861736baf8e9a302fbf651a5b14d3
2019-07-05 10:56:15 +08:00
Pasty Chang
834ee12237
Merge "Remove attribute colorError from settings glif theme"
2019-07-04 11:04:52 +00:00
TreeHugger Robot
355bb4d783
Merge "Improve Settings launch performance"
2019-07-04 09:42:23 +00:00
TreeHugger Robot
fae6799624
Merge "Fix nevigation up to wrong place"
2019-07-04 08:29:53 +00:00
tmfang
0c37f019f6
Improve Settings launch performance
...
From traces analysis, we found getFreeBytes
was taking a long time to return.
getFreeBytes was used when storage controller
tried to get storage information.
In order to prevent this case, we put the action
which takes too much time in background thread.
Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes: 136268875
Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
2019-07-04 16:09:34 +08:00
TreeHugger Robot
79cf1bb06c
Merge "Separate long press timeout preference controller form accessibility"
2019-07-04 08:08:27 +00:00
Sunny Shao
600ba96eea
Fix nevigation up to wrong place
...
Remove the parentActivityName attribute of the Settings$ManageDomainUrlsActivity
in the manifest.xml.
Fixes: 136686496
Test: manual
Change-Id: I99587dc99eea7fd2a22f11b839033e841eadb411
2019-07-04 11:52:59 +08:00
Raff Tsai
7f740e2064
Merge "Fix robolectric test failure"
2019-07-04 03:03:41 +00:00
Bill Yi
ebeb9e185e
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours am: b038d65f4c -s ours
...
am: fa99f72ad3
2019-07-03 19:38:54 -07:00
pastychang
9ad817d503
Remove attribute colorError from settings glif theme
...
The attribute colorError has set in glif theme of setupdesign library. Remove it from
settings glif theme to avoid it overriden.
Bug: 128399555
Test: Manual
Change-Id: I08aa1053a6eb21b014246dcd116d7b2f4b7413e1
2019-07-04 02:30:08 +00:00
Mark Chien
5cc68af9ca
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev am: 8a44e4f274
...
am: 649f98541a
2019-07-03 19:21:40 -07:00
Raff Tsai
d7b5583e19
Fix robolectric test failure
...
Fixes: 136660042
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection.CodeInspectionTest"
Change-Id: I348f70d348b61676c04bc384e99c6e71c73eaa26
2019-07-04 01:56:11 +00:00
Bill Yi
34eba28f51
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours am: 479df9b529 -s ours
...
am: dbd5065d5b
2019-07-03 17:55:31 -07:00
Bill Yi
fa99f72ad3
[automerger skipped] Import translations. DO NOT MERGE am: a0fb9000bb -s ours
...
am: b038d65f4c
2019-07-03 17:36:47 -07:00
Bill Yi
e06bee0fc3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 246873db8e -s ours
...
am: 9dc4eb1470
2019-07-03 17:28:33 -07:00
Mark Chien
649f98541a
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
...
am: 8a44e4f274
2019-07-03 17:19:49 -07:00
