Commit Graph

60452 Commits

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
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
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
a2a1056dda Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev 2020-03-18 05:22:27 +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
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
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
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
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
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
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
618ebc3fdf Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
Change-Id: I5914dc21bfa9659fe8ad7abfff027aa10ab5c210
2020-03-17 13:28:15 +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
c63489139c Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
Change-Id: Ic2788de5e3d7926813d5f36293cef55f67edc131
2020-03-17 13:03:09 +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
c57774521c Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
Change-Id: I6b25ea976cbde89633e917491513254163d8418d
2020-03-17 11:50:00 +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
Alex Johnston
79e66ffafe Fix strings for certificate installation in Settings
Certificates privacy page
* Changed 'Your privacy is at risk' to
  'Your data won't be private'.
* Change 'information' to 'data'.
* Changed 'Install anyways' to
  'Install anyways'.

Can't install certificate dialog
* Changed 'Can't install certificates'
  to 'Can't use this file'.

Bug: 151303108
Test: Manual testing
Change-Id: Ia66ff7210ae77204fa2e59f3264f5c799cc47436
2020-03-17 10:05:28 +00:00
govenliu
26b70a9bc7 [Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest
Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
2020-03-17 18:05:00 +08:00
Yanting Yang
298a7fe2e5 Remove the index of the homepage category tiles
Do not index the tiles of homepage category since we would like to index
their target activity for search.

Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
2020-03-17 17:55:49 +08:00
SongFerngWang
3d54554521 Fix sim pin lock preference disappear in dual sim.
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-17 14:35:31 +08:00
Automerger Merge Worker
e599f0432e Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
Change-Id: Ief773b87a528393024fde3bef29816f6860e07f2
2020-03-17 05:58:42 +00:00
TreeHugger Robot
1a84719041 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev 2020-03-17 05:43:45 +00:00
Automerger Merge Worker
bd59e9ad27 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
Change-Id: Iada645d9939d5b7343d1ebef27ccba669e9dc268
2020-03-17 03:45:43 +00:00
tim peng
95cd4c9414 Merge "Output switcher header is not updated with the latest media content" into rvc-dev 2020-03-17 03:26:50 +00:00
Automerger Merge Worker
371df82782 Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
Change-Id: I226fb53261abdeb91e6b8bc77eadc698b1863140
2020-03-17 02:48:03 +00:00
Menghan Li
3f5b95193b Merge "Update R accessibility assets and strings (4/n)" into rvc-dev 2020-03-17 02:28:23 +00:00
Tim Peng
36c4949414 Output switcher header is not updated with the latest media content
-Register media controller callback
-Update panel header when medadata changes
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Id0b8f997899a96c0c94ca6bf099e624a9e87795b
2020-03-17 09:02:34 +08:00
Automerger Merge Worker
391d6763fa Require attention pref not searchable by default am: 593b5671c8
Change-Id: I42a89f083a44b644b95f88ebf0a4ef93036a5ccd
2020-03-17 00:34:28 +00:00
Blake Kragten
8881b110cd Enhanced Connectivity Enabled Default
Changed to enable enhanced connectivity by default

Test: On Device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnhancedConnectivityPreferenceControllerTest
Test: On-device using developer option menu

Bug: 151633345
Change-Id: I8706f3a15af02214f4516503e685ff2b8f348a3a
2020-03-16 16:46:03 -07:00
Automerger Merge Worker
875e3d7e9f Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878
Change-Id: I0a54df099ff98d68a165ce41b5de18ab27bcc8bf
2020-03-16 22:40:58 +00:00
Automerger Merge Worker
a7a2a28247 Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878
Change-Id: I4f885bb7ccd171693ed239441dd86a5f41ccf503
2020-03-16 22:40:58 +00:00
Automerger Merge Worker
0fbe648878 Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017
Change-Id: I1a5185fb2c7eae81cd98ccbe713a333e09431d64
2020-03-16 22:21:51 +00:00
Treehugger Robot
177ce8f017 Merge "Fix mismatching intent filter string in AndroidManifest.xml" 2020-03-16 22:07:18 +00:00
joshmccloskey
593b5671c8 Require attention pref not searchable by default
Test: Attempted to search with the keyword eyes and found nothing.
Bug: 150933895
Change-Id: Ic69d4fc9fe495fe6d133b695ce48055f6fd65d35
2020-03-16 22:03:28 +00:00
Grace Jia
16092ab56f Fix mismatching intent filter string in AndroidManifest.xml
Test: Manual
Bug: 149524255
Change-Id: Ic5bfbfa41cba18ccc8166624da33c70b69db73f5
2020-03-16 13:27:25 -07:00
Kweku Adams
a7e58d7732 Change to public POWER_SAVE_MODE_CHANGED broadcast.
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.

Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
2020-03-16 12:56:46 -07:00
Automerger Merge Worker
022790b197 Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
Change-Id: Ic74ab9f03b43fd1eebcb6fc32556f37b31c20943
2020-03-16 19:08:28 +00:00
TreeHugger Robot
b2c35f7fcc Merge "Do not finish early if caller is SUW" into rvc-dev 2020-03-16 18:56:54 +00:00