PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,708 Commits 1 Branch 0 Tags
47c78f4f7201d88a19b6d992b3b7f30cc64600cf
Commit Graph

60708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blake Kragten
d19b162a1b Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 
Change-Id: I5dd0af4e65117be6b5f28ee3ab91ea73a977c4fc
 2020-03-18 21:50:16 +00:00
Anthony Stange
2012e6706a Revert "Show only listUIChanges instead of all" 
Revert submission 10721220-hide

Reason for revert: Caused build breakage - b/151857606
Reverted Changes:
I7c725a1ec:Show only listUIChanges instead of all
Iec8755171:Introduce listUIChanges API for developer UI

Change-Id: I7753051b06faf1f48a818a134d1eda2500f817f8
 2020-03-18 21:33:10 +00:00
Blake Kragten
75f0bdb400 Merge "Enhanced Connectivity Enabled Default" into rvc-dev 2020-03-18 21:25:11 +00:00
Rubin Xu
19f628ab39 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 1d01ee0d97 
Change-Id: I677703c99b318b0eec83e190a7713b90babbb56b
 2020-03-18 19:15:24 +00:00
Rubin Xu
9808d41e62 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6 
Change-Id: I2937deadc83562051747b19233548c0446787343
 2020-03-18 19:15:08 +00:00
Rubin Xu
8d4aca50c6 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d 
Change-Id: I5393bbdeaa05c60f4bd107b556bada17dd6c9726
 2020-03-18 19:02:34 +00:00
Rubin Xu
1d01ee0d97 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d 
Change-Id: I6dda830e2e54011d505a70bdb8a10593dc8adbdd
 2020-03-18 19:02:24 +00:00
Rubin Xu
b79e01680d Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev 2020-03-18 18:48:23 +00:00
Anna Trostanetski
88cea039de Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 
Change-Id: I4acea8cfd6364c546594f26ecfd2e552c7fb6e0a
 2020-03-18 18:21:25 +00:00
Anna Trostanetski
038b9549a8 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298 
Change-Id: I8d94992534da7e2b971908c1e43d5cbc29f2d4d7
 2020-03-18 18:20:23 +00:00
Anna Trostanetski
9d653e5298 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd 
Change-Id: I7f238ccc501bf9a359c129ab019e627eb1be16d3
 2020-03-18 18:18:29 +00:00
Anna Trostanetski
c5cdb8ec58 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd 
Change-Id: Ia767e2ec4fbe88a646784290769e7bac692c8cac
 2020-03-18 18:18:15 +00:00
Anna Trostanetski
49187777dd Merge "Show only listUIChanges instead of all" into rvc-dev 2020-03-18 18:15:52 +00:00
PETER LIANG
f49bf6be94 Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: e0ec4b853b 
Change-Id: Ie487ab9124d61fad77273277ec235a14330f6e8f
 2020-03-18 12:36:02 +00:00
PETER LIANG
bdf8412ec1 Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa 
Change-Id: I53d67dfee3c722161244bd2bd4348cb9ec585d34
 2020-03-18 12:35:53 +00:00
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
robertluo
7f11d3f74a Rename "Tap & pay" to "Contactless payments" 
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
Merged-In: I412c5b5681a85d482541ae30faa13e904942b612
(cherry picked from commit 86a6cb8ead)
 2020-03-18 10:51:58 +00:00
changbetty
e9f857621f [Mainline] Use public method in SubscriptionManager for mainline 
- getActiveSubscriptionIdList
   To use getActiveSubscriptionInfoList to get subscription Id list
 - getActiveSubscriptionInfoList(Z)
   To use getActiveSubscriptionInfoList() instead

Bug: 144478274
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
       make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest

Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
Merged-In: I4d6113561906af5c9e4ac7737aefac17c926059a
 2020-03-18 10:33:39 +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
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
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
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
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
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
Sarah Chin
20974b6814 5G meteredness for telephony framework 
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
 2020-03-17 18:47:07 +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
8064cadb1a [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: b98a90bfa2 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic8470477a77d37ea21517396ee1acfa2434a7e1b
 2020-03-17 15:43:38 +00:00
Automerger Merge Worker
a62897caa5 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I85c005713515e9397827f38651326f5f63d47f80
 2020-03-17 15:43:25 +00:00
Automerger Merge Worker
47a86f9fe4 Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp 2020-03-17 15:42:59 +00:00
Automerger Merge Worker
71a49d8c8b Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 
Change-Id: I66efa1d7430a50a3a8f5bf6f04ade55377d2bfaf
 2020-03-17 15:42:53 +00:00
Automerger Merge Worker
75ae98d1be Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932 
Change-Id: Ia679b9dca2a3f98eca1647e276db82ff426c0791
 2020-03-17 15:42:53 +00:00
Automerger Merge Worker
b98a90bfa2 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours 
am skip reason: subject contains skip directive

Change-Id: I8ce297d4d28cbf33b51c59c9ed71c12044c211e3
 2020-03-17 15:27:12 +00:00
Automerger Merge Worker
d9dcf5bed2 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours 
am skip reason: subject contains skip directive

Change-Id: I322de6c13adf1a7d3ca194d6b4b9a8d3f6a270d6
 2020-03-17 15:27:08 +00:00
Automerger Merge Worker
b67ed25932 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 
Change-Id: I7c2992488d3ab3d552a12e207093d1deffee4ded
 2020-03-17 15:26:33 +00:00
Automerger Merge Worker
2779662793 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 
Change-Id: I5c40a566a91465c230c98be2201d158c945c7103
 2020-03-17 15:26:05 +00:00
Automerger Merge Worker
f9b7313545 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id75d1c9d9ba97160bfa72e8bcdde3a0407856157
 2020-03-17 15:11:40 +00:00
Automerger Merge Worker
94f905bd9d [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icd688c1135ffd48dd178eaf2a7e3665e85deca52
 2020-03-17 15:11:36 +00:00