PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,757 Commits 1 Branch 0 Tags
d36930fc530df1fca819d6f4ec20575254dfa93c
Commit Graph

61757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PETER LIANG
e0ec4b853b Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb 
Change-Id: I97f07e429505e23ca5e7ff34e1f48dd635c1d780
 2020-03-18 12:08:16 +00:00
PETER LIANG
6acf430dfa Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb 
Change-Id: I3289e93f31d29e4bfba953e775b2097ddf776e26
 2020-03-18 12:08:08 +00:00
PETER LIANG
76fb737beb Merge "Revise strings for tutorial improvement." into rvc-dev 2020-03-18 11:50:18 +00:00
Rubin Xu
397ee8b563 Do not reset incorrect password attempts after biometric authentication 
For work challenges, do not reset incorrect password attempts if
challenge is resolved via biometric authentication. This is the
behaviour for personal keyguard and work challenge should be
consistent.

Bug: 139438785
Test: manual: enroll work challenge with fingerprint, set failed wipe
count (3) via TestDPC and attempt two failed attempts (via cmd
lock_settings). Resolve work challenge with fingerprint and attempt one
last failed attempt. Verify work profiel is wiped.

Change-Id: Ic64d3e44f3faa5adf8ac43db09e33c8403427990
 2020-03-18 11:38:30 +00:00
TreeHugger Robot
6fb1667b60 Merge "Rename "Tap & pay" to "Contactless payments"" 2020-03-18 10:41:35 +00:00
Peter_Liang
8b411bfa55 Revise strings for tutorial improvement. 
Bug: 148989018
Test: manual test
Change-Id: I249c5ae896123b546b028c959cd1a5404008aec3
 2020-03-18 17:24:16 +08:00
robertluo
86a6cb8ead Rename "Tap & pay" to "Contactless payments" 
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
 2020-03-18 14:57:39 +08:00
TreeHugger Robot
3186224742 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 am: 7673cfa430 am: 32cac4cd56 
Change-Id: I703e30eb861ceb4eb7b8201875f7e0b4edef11c0
 2020-03-18 06:11:21 +00:00
TreeHugger Robot
32cac4cd56 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 am: 7673cfa430 
Change-Id: Id2fdac3d4ce632066cc65f914a5e24b5cd8ec38b
 2020-03-18 06:11:05 +00:00
TreeHugger Robot
26f8f03ec3 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3 am: a830006b74 am: 54ad6ea477 
Change-Id: Ic75f536a8369c62417f5784acd84242686b4d15e
 2020-03-18 06:10:59 +00:00
TreeHugger Robot
f0c9ee7e39 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d am: e6e0431e66 
Change-Id: Ic11e5d15f0db219d8025062d2def6ad5c98c413e
 2020-03-18 06:10:40 +00:00
TreeHugger Robot
54ad6ea477 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3 am: a830006b74 
Change-Id: I09e6aa72a3f7401ab60893b4940ad4ea8065cbf4
 2020-03-18 06:01:11 +00:00
TreeHugger Robot
e6e0431e66 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d 
Change-Id: If4407cb7becef2baa8a868fc09f9183bd4d6a49d
 2020-03-18 06:01:03 +00:00
TreeHugger Robot
7673cfa430 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 
Change-Id: I06bb2b3b3698e91f35d7bc54d798c917185fbb42
 2020-03-18 06:01:02 +00:00
TreeHugger Robot
8212c33768 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 
Change-Id: Ic8f5ed6ee3132904f00e74f53259aeb274c82fed
 2020-03-18 05:49:02 +00:00
TreeHugger Robot
a830006b74 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3 
Change-Id: Ib9500d7e76796c394500717a5b1bbebf4c8a9c21
 2020-03-18 05:49:02 +00:00
TreeHugger Robot
5e7b076c2d Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 
Change-Id: I7071b8d5bc3d1c1ee20b75ac92f12d532e723f14
 2020-03-18 05:48:47 +00:00
TreeHugger Robot
e281086ce3 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda 
Change-Id: I3ddb79684d912b7c336a6ffaf165a2a7ab1b5c06
 2020-03-18 05:37:21 +00:00
TreeHugger Robot
17962d8186 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda 
Change-Id: I260656236087cc7a0bff2f278a90dc7f3d52b688
 2020-03-18 05:37:14 +00:00
TreeHugger Robot
a2a1056dda Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev 2020-03-18 05:22:27 +00:00
TreeHugger Robot
71357f9d0d Merge "Ignore broken test cases" 2020-03-18 03:23:31 +00:00
Menghan Li
c05f8bd713 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922 am: 6be3263f5c am: f65ba41a8b 
Change-Id: I9a12afdda9aaa16814ca7c72c79f5d5b317cf7f5
 2020-03-18 01:52:22 +00:00
Menghan Li
19474b19f2 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324 am: 699eb07df2 am: 41b3ea78ea 
Change-Id: Iba13c74e4f241d6dd2fa44ee9213c08e09ae9f2e
 2020-03-18 01:46:21 +00:00
Menghan Li
f65ba41a8b Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922 am: 6be3263f5c 
Change-Id: I7c20a38db31d7b4ca891f3d6c1a53e57e19797c8
 2020-03-18 01:46:20 +00:00
Menghan Li
e3b6dffbc6 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 286d6ac7dc am: 23627fad2b 
Change-Id: I356f7ed0d558df34f9dd63299efd8372dcd980bc
 2020-03-18 01:45:59 +00:00
Menghan Li
41b3ea78ea Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324 am: 699eb07df2 
Change-Id: Iecf70d242ca907315132d3edf2af700f1f6e4ba7
 2020-03-18 01:30:08 +00:00
Menghan Li
23627fad2b Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 286d6ac7dc 
Change-Id: I48e195e58f45f53a28b691dbc5a556bcb8d21da7
 2020-03-18 01:30:02 +00:00
Menghan Li
6be3263f5c Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922 
Change-Id: I0717caf7787cc4ee1cfc5acac204e7753a4d2680
 2020-03-18 01:29:57 +00:00
Menghan Li
699eb07df2 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324 
Change-Id: Ia2401d530ea63ef972f2365dba5d31e18df49f59
 2020-03-18 01:24:20 +00:00
Menghan Li
29d33f3922 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef 
Change-Id: Ia350ab892c9356a4f4aa02be26a1c28d625238cd
 2020-03-18 01:18:26 +00:00
Menghan Li
286d6ac7dc Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef 
Change-Id: I3773bbc143c16b62b8e6c052844b043db8a8ee0e
 2020-03-18 01:18:06 +00:00
Menghan Li
f8eb71c324 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 
Change-Id: Id7d2b3ffd27ec01ff3bc2eb8a96dcfecb857b0a3
 2020-03-18 01:05:52 +00:00
Menghan Li
1b14eb0eef Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 
Change-Id: I43d9c46d008f794cb4763356de0c8e15b11df236
 2020-03-18 01:05:24 +00:00
Menghan Li
a56e57eaa4 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev 2020-03-18 00:50:43 +00:00
Eric Sandness
665b3d085e Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 am: 31f1136d1d am: ba4e378cd5 
Change-Id: I21ca3e5fb9ee3cee12d30f6e9c4ba85bf507cea4
 2020-03-17 21:17:57 +00:00
Eric Sandness
ba4e378cd5 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 am: 31f1136d1d 
Change-Id: If0a1ad7c0a57e083017b72ccd446486d4f115889
 2020-03-17 21:12:33 +00:00
Eric Sandness
d4fe9e1e84 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: 2f0b328750 am: 248117ed17 
Change-Id: I6336124b851ebeef27c01c3e9d2ac66b5b309f09
 2020-03-17 21:12:24 +00:00
Eric Sandness
f483084edb Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1 am: f9720237fc 
Change-Id: Ie0dedea428394e0b9b52584b48ea61671d8e1ef8
 2020-03-17 21:12:16 +00:00
Eric Sandness
248117ed17 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: 2f0b328750 
Change-Id: Ibc4e63891aea6c75ecc8039b67b4739f987f6d3f
 2020-03-17 21:03:10 +00:00
Eric Sandness
f9720237fc Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1 
Change-Id: If1b396d0d51b0e6cf27dec1fd67aee92e81151f9
 2020-03-17 21:02:58 +00:00
Eric Sandness
31f1136d1d Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 
Change-Id: I496a3bd8d3537355b746cdd275de7924c63bf064
 2020-03-17 21:02:48 +00:00
Eric Sandness
2f0b328750 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea 
Change-Id: I96d55ab5a3bfb3adf1fb76fae54d08e7f1bf11e6
 2020-03-17 20:46:30 +00:00
Eric Sandness
ea2c433f17 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea 
Change-Id: Ibe1ecf76d11cfcb70935c88fb5c0df69eeab567a
 2020-03-17 20:46:06 +00:00
Eric Sandness
e6951038a1 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f 
Change-Id: Ibec79237493fc8ac537a57588db0751fcd92f91c
 2020-03-17 20:46:05 +00:00
atrost
06da8b6ebc Show only listUIChanges instead of all 
Use the new method that filters out changes that shouldn't be in the
developer UI.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I7c725a1eca32e2d253b9671c789777b5422ed469
 2020-03-17 20:37:49 +00:00
Eric Sandness
29a37648ea Use ChooseLockGeneric When Started By Admin App am: 7430932305 
Change-Id: I1a2cacc0c556b9ebdedf579ffe8516b7851f02dd
 2020-03-17 20:34:49 +00:00
Eric Sandness
66df88126f Use ChooseLockGeneric When Started By Admin App am: 7430932305 
Change-Id: I78fd46587c0d3c598867c972bb9c9df038b30a1b
 2020-03-17 20:34:12 +00:00
Eric Sandness
7430932305 Use ChooseLockGeneric When Started By Admin App 
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity.  If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric.  Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.

Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
 2020-03-17 17:16:08 +00:00
Automerger Merge Worker
47fd4be07b [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours am: b7d23d13b8 -s ours am: c8ada7e6ce -s ours 
am skip reason: subject contains skip directive

Change-Id: I73785303e86016105cbbdc65f9d1f712e0f96b47
 2020-03-17 16:45:28 +00:00
Automerger Merge Worker
775af87b61 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b am: 0eb0fce1be am: fb47646e1f 
Change-Id: I17f0e5770a9eeb26e4b95046c17c64cc49e8ccb9
 2020-03-17 16:41:45 +00:00