PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,370 Commits 1 Branch 0 Tags
09ed274f0590fdd4098f0a06b6422ef53a0c95c7
Commit Graph

60370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
09ed274f05 [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: 97cc247663 -s ours 
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: I95b0e51c6cf838c395fa330e14561e45fa535739
 2020-03-19 03:12:49 +00:00
TreeHugger Robot
9e94fc6afa Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 
Change-Id: Id7287ffa053c08817c3c4f5ba71dea3ab649a21f
 2020-03-19 03:12:28 +00:00
TreeHugger Robot
97cc247663 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d 
Change-Id: Icad20acd12a7bf4e2ee9f95c389c590e3d458071
 2020-03-19 02:52:30 +00:00
TreeHugger Robot
dde6e031f7 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d 
Change-Id: Id07e6022613be6dd8a34d25d1004bb15fe52b0cd
 2020-03-19 02:52:01 +00:00
TreeHugger Robot
c114c5b59d Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev 2020-03-19 02:36:55 +00:00
Treehugger Robot
1b4e1dc57e [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours am: 9bbd35b576 -s ours 
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: I1f8a784778d0130c683d9d759cee3cf266b8ae08
 2020-03-19 02:06:59 +00:00
Treehugger Robot
9bbd35b576 [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours 
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: Ibe2c542a784ff8309de5fd6a370050d5a0aed8bd
 2020-03-19 01:46:07 +00:00
Treehugger Robot
e18b79d22d Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 
Change-Id: I95089501349894acad9e09b4417c74657a906722
 2020-03-19 01:37:20 +00:00
Treehugger Robot
84fab912b0 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" 2020-03-19 01:36:09 +00:00
Anthony Stange
475b73ba05 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: d7c3458743 
Change-Id: I274199a33e17f4a079447a5df6c653ad3db20e6b
 2020-03-18 22:16:58 +00:00
Blake Kragten
77a5a0aba2 Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: ac9917a6be 
Change-Id: Ic3a3f4d89c04cf07c8eeeb50f7a5e12d4ad79b82
 2020-03-18 22:15:02 +00:00
Anthony Stange
5c873f2087 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 
Change-Id: I8d2845ce0a3fbd9126763486e89fe36968c39a3b
 2020-03-18 22:13:11 +00:00
Blake Kragten
9c5a63edd2 Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b 
Change-Id: I82fe7853da86b2802a1bc77fa1ddc3d2d535ec2e
 2020-03-18 22:12:02 +00:00
Anthony Stange
d7c3458743 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be 
Change-Id: I5a5af738409ba0c73ea0062e0a973702baab7f03
 2020-03-18 21:56:30 +00:00
Anthony Stange
c984a18721 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be 
Change-Id: I70421ccd985810c8a17910b71986f12296fc65f5
 2020-03-18 21:55:15 +00:00
Anthony Stange
95975931be Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev 2020-03-18 21:52:29 +00:00
Blake Kragten
ac9917a6be Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 
Change-Id: Ifcc874f67cc3197153789fafb1077876b0a333b1
 2020-03-18 21:51:49 +00:00
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
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