PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,663 Commits 1 Branch 0 Tags
8bc2aced91d68c43c94c36dbb0c55d88613edd66
Commit Graph

59663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8bc2aced91 Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a 
Change-Id: I18216a296b2b65bd445a0bfdc6b98f13f2276d9c
 2020-03-19 09:58:38 +00:00
TreeHugger Robot
856079384a Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev 2020-03-19 09:43:40 +00:00
Lee Chou
01ea52c474 Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39 
Change-Id: I963339e5cb2615d54e23929fdf97ce837f18495f
 2020-03-19 07:46:18 +00:00
TreeHugger Robot
4731f3c571 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44 
Change-Id: If8a9610b3d12eeff785d09b17731bb114c85cd68
 2020-03-19 07:45:46 +00:00
Lee Chou
fbde0b3b39 Merge "Adds logging to confirm esim deletion feature" into rvc-dev 2020-03-19 07:44:20 +00:00
TreeHugger Robot
f210cf3c44 Merge "Tweak string for Display over other apps" into rvc-dev 2020-03-19 07:26:03 +00:00
tim peng
01d3b13273 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 
Change-Id: Icbd0a3472d2a4cdb2c7b5cd4c8fef0464c736e87
 2020-03-19 06:26:50 +00:00
tim peng
91ad46fa60 Merge "Close panel when media stop" into rvc-dev 2020-03-19 06:08:05 +00:00
Tsung-Mao Fang
6f6e6810ae Tweak string for Display over other apps 
Fix: 144901996
Test: Visual
Change-Id: I5dacf8146130431624300d04421351a87ebd4d23
 2020-03-19 05:04:53 +00:00
Bonian Chen
7083092623 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e 
Change-Id: I74165063a6b4924529cb4e25652756fa713b5048
 2020-03-19 04:48:18 +00:00
Bonian Chen
c073abaf2e Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev 2020-03-19 04:35:39 +00:00
Lee Chou
443cfd2ef4 Adds logging to confirm esim deletion feature 
Bug: 138861284
Test: make SettingsGoogle  and manual testing
Change-Id: Ie5f6f6a31003733ae7abd9c04e9b3c371d5051c4
 2020-03-19 12:07:01 +08:00
SongFerngWang
4f0d7b3781 [5G settings UI] add String for the 5G limited VoLTE dialog 
while User disable VoLTE, UE show warning Dialog for 5G disable
add String for it.

Bug: 151313654
Test: build pass.
Change-Id: I2246664f1acbd2489dc3540486a7e1fa08d66656
 2020-03-19 11:17:45 +08: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
Tim Peng
650eda307b Close panel when media stop 
-Add forceClose callback to finish panel
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Ic0ac2880a4ff412382816ccb41b4fbb60dbdf519
 2020-03-19 10:02:35 +08: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
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
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
b79e01680d Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev 2020-03-18 18:48:23 +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
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
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
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
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
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
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
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
Alex Johnston
e61aaaab51 Merge "Fix strings for certificate installation in Settings" into rvc-dev 2020-03-17 15:07:18 +00:00
Automerger Merge Worker
a4ad8f636a Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 
Change-Id: If102804bbb1335393bcd208f32cf66ab9a58e41d
 2020-03-17 13:28:11 +00:00
menghanli
d1adcc61a2 Update R accessibility assets and strings (5/n) 
- Magnification rich content
- Color inversion rich content

Bug: 148837311
Test: Manual test
Change-Id: I4dc52aa00f22cba9cea0c91be3af0b9cb7093182
 2020-03-17 21:12:15 +08:00
Yanting Yang
9204d76c45 Merge "Remove the index of the homepage category tiles" into rvc-dev 2020-03-17 13:11:40 +00:00
Automerger Merge Worker
85b0f5fcd2 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 
Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
 2020-03-17 13:03:00 +00:00
TreeHugger Robot
76f4a29510 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev 2020-03-17 12:51:04 +00:00
Automerger Merge Worker
05985cb26e Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 
Change-Id: I055e1aa8b1be85d6ba1218642447885fa9b454d9
 2020-03-17 11:49:55 +00:00
TreeHugger Robot
217740d640 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev 2020-03-17 11:32:34 +00:00
Bill Yi
8f23d00553 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
 2020-03-17 04:18:33 -07:00
calvinpan
ff11f200c8 Add NR Global to the logic to check if it is Global 
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
 2020-03-17 18:27:34 +08:00