Commit Graph

79012 Commits

Author SHA1 Message Date
Julia Reynolds
c1ca4b81c1 Fix some issues with notif blocking in settings
- Fix cast cast exception
- Make sure unblocking a notification channel also actually
unblocks it

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 177968301
Fixes: 177907827
Change-Id: Ibad56e102e167bcf004fbd0f9873cc29834a30c1
2021-01-21 11:13:57 -05:00
Arc Wang
02c9b032cd Show "Safety & emergency" in Settings search result
Add android:key to PreferenceScreen of EmergencyDashboardFragment.

Bug: 177426215
Test: manual
Change-Id: I9ad059a1dd051cb1ca0c038fd6c47b739852c54d
2021-01-21 07:24:47 +00:00
TreeHugger Robot
9c4e419b61 Merge "Default emergency gesture setting On." 2021-01-21 02:49:25 +00:00
TreeHugger Robot
f6390d7924 Merge "Revert "Workaround Wi-Fi Settings NullPointerException"" 2021-01-21 02:44:15 +00:00
Manish Singh
8793a746fa Merge "Switch the default option from B to A" 2021-01-20 23:46:25 +00:00
Bill Yi
a2be7b8311 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2bf6a2bbd2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13375919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If29c9dc5f7bc59dbabd7b642575c6504788a6548
2021-01-20 22:12:17 +00:00
Bill Yi
3743d2acb6 Merge changes from topic "presubmit-am-311b41832b7f4d57b11bec6ed18f8095"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f253392e46
  Import translations. DO NOT MERGE ANYWHERE
2021-01-20 21:52:36 +00:00
Bill Yi
2bf6a2bbd2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-01-20 21:52:36 +00:00
Bill Yi
6131c314f0 Merge changes from topic "presubmit-am-c0aae4a9c9494a35a4be665a1ad0f83d"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b375f1e2f0
  Import translations. DO NOT MERGE ANYWHERE
2021-01-20 21:52:20 +00:00
Fan Zhang
e81091175e Default emergency gesture setting On.
And a few drive-by fixes:
* Move all emergency gesture fragments and controllers to emergency
  package for better code colocation.
* Remove the placeholder video preference from emergency_gesture_settings.xml

Bug: 178009196
Test: reran robotests
Change-Id: Ifcb591e7ab8e5e5494c480cbbe9410c08c296f8e
2021-01-20 13:08:04 -08:00
Peter Wang
bdcf4b7535 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" 2021-01-20 20:55:00 +00:00
Manish Singh
1c1329948f Switch the default option from B to A
The switch implies that we will not transcode by default.

Test: manual
BUG=177931834

Change-Id: I6daee5bdf0f77ef65eda2db6be055fad0bceded3
2021-01-20 19:37:28 +00:00
TreeHugger Robot
a347993239 Merge "Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY" 2021-01-20 18:05:49 +00:00
Yanting Yang
47e0556e98 Revert "Workaround Wi-Fi Settings NullPointerException"
This reverts commit 99eb12048c.

Reason for revert: Revert this workaround since the real solution has been submitted and released. More information please see b/177766209.

Change-Id: I566194ff71bb9e912407d6d4b3798adc6be71779
2021-01-20 16:41:36 +00:00
Bill Yi
87bc28225c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b375f1e2f0
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13375400

Change-Id: I5d669d3b7ee62ea439703592e1f01aff2d4f8efc
2021-01-20 15:55:14 +00:00
TreeHugger Robot
0f4b83a760 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-20 15:55:00 +00:00
Bill Yi
b375f1e2f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24202252f42fa2fd1c401b437ede5f90a561ac6a
2021-01-20 07:54:48 -08:00
Alex Johnston
8403e31d82 Merge "Fix CredentialManagementAppControllerTest" 2021-01-20 15:24:14 +00:00
Bill Yi
ac982a0cdd [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f253392e46
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13375919

Change-Id: I9533336ffb06722361bdafe42b57af21df523103
2021-01-20 15:06:57 +00:00
Bill Yi
f253392e46 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iebb51a5fceee6d39e00b2de88c7d19a352411647
2021-01-20 07:06:43 -08:00
TreeHugger Robot
f4e71b0019 Merge "Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY" 2021-01-20 14:40:25 +00:00
Bill Yi
be90f6318f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I19076a8152f6ba636d959f92303fcdd9d5df46e5
2021-01-20 12:01:54 +00:00
Alex Johnston
8fc55e0231 Fix CredentialManagementAppControllerTest
Bug: 175277372
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CredentialManagementAppControllerTest
Change-Id: I5f9177d19232f38a761df9adba94d080464120e2
2021-01-20 11:29:07 +00:00
Rubin Xu
bc5da644dd Add metrics for EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY
Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: I2bcd6c4f1a5f04582bb88ec9fb285621b9ec77eb
2021-01-20 11:17:13 +00:00
Rubin Xu
ff1b547548 Support EXTRA_DEVICE_PASSWORD_REQUIREMENT_ONLY
When set, only enforce password requirement explicitly set device-wide.

As part of the change, restructure the code such that ChooseLockGeneric
becomes the central place for aggregating password requirements from
different parties, while ChooseLockPassword only enforces whatever
password reuirement it is told (by ChooseLockGeneric via intent extras)

Bug: 169832516
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password

Change-Id: I0acbea4819c13d4a8444c7b06928baccead18837
2021-01-20 11:16:22 +00:00
Ben Chung
1c7eba6660 Merge "Add audio adjustment fragment in a11y settings" 2021-01-20 08:49:35 +00:00
Jeremy Goldman
1f09c95571 Merge "Helper function to return the unique name for subscription info" 2021-01-20 00:14:41 +00:00
Peter Wang
0044fee7cb Add an intent filter for MobileNetworkListActivity to enable access
from the LPA

Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
2021-01-19 15:18:14 -08:00
TreeHugger Robot
844bfb3683 Merge "Fix null handling" 2021-01-19 21:14:40 +00:00
Abel Tesfaye
fc2582c0ea Merge "Correct Wifi Share UI margins and capitalization" 2021-01-19 20:00:49 +00:00
Julia Reynolds
833514376e Fix null handling
Test: cts verifier, notification listener
Fixes: 177202279
Change-Id: Ib25915b0b5a60e9c39986d3ba3af3073e9d2b822
2021-01-19 14:48:52 -05:00
TreeHugger Robot
544310993e Merge "Update FingerprintEnrollFindSensor for UDFPS" 2021-01-19 17:51:32 +00:00
Mill Chen
057ce4055e Update FingerprintEnrollFindSensor for UDFPS
Since the education page of UDFPS is different from the one for rear
fingerprint, it's necessary to create a new education page for UDFPS and
update the decription.

Bug: 177026524
Test: visual verified
Change-Id: I70eb80484cccfbb583c32dbaadbc6c2744b5db60
2021-01-20 00:01:35 +08:00
Jeremy Goldman
67c75ac102 Helper function to return the unique name for subscription info
Many classes within Settings have access to the subscription info, rather
than only having access to the subscription id. For these classes, it is
more convenient to have a helper method where the whole subscription
info can be passed in, rather than having to call the
getSubscriptionId() helper method in so many locations within the
telephony settings codebase.

Bug: 150370656
Bug: 148303118
Test: atest -c SubscriptionUtilTest
Change-Id: I181960933ab8610d5572b7a7d6671fab8c1dbd22
2021-01-19 09:30:14 +00:00
TreeHugger Robot
119bbbd308 Merge "[Provider Model] Add Fix connectivity toggle to Internet Settings" 2021-01-19 07:28:18 +00:00
Weng Su
598934d645 [Provider Model] Add Fix connectivity toggle to Internet Settings
- Add Fix connectivity toggle in menu item

- Show "Resetting your internet..." when recovering

- Screenshot:
  https://screenshot.googleplex.com/BPyRADfNUoPE8Dc

Bug: 172297799
Test: manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I27594d24659ca281e224f86accc20d49514d5001
2021-01-19 06:08:53 +00:00
SongFerng Wang
8ee28c1baa Merge changes I79b4c3d4,Icc8a7793
* changes:
  [Provider mode] Carrier item display network type on slice.
  The provider model slice carrier toggle is broke.
2021-01-19 05:55:17 +00:00
Colin Cross
52033e133a Merge changes from topic "revert-13183140-SettingsGoogle-bp-NMIISXZYTU"
* changes:
  Revert "Export proguard.flags, manifest and sources for use by S..."
  Revert "Build Settings-robo-testutils for use by SettingsGoogleR..."
2021-01-19 05:28:29 +00:00
Colin Cross
3e2426ca79 Revert "Export proguard.flags, manifest and sources for use by S..."
Revert submission 13183140-SettingsGoogle-bp

Reason for revert: b/177766209
Reverted Changes:
I73bef76ec:Add ArcSettings and SettingsGoogle to the legacy a...
I385629c5c:Build Settings-robo-testutils for use by SettingsG...
I863e1d658:Convert ArcSettings to Android.bp
If095bc39d:Convert SettingsGoogleRoboTests to Android.bp
I8d3f32cd4:Convert SettingsGoogle tests to Android.bp
I7ddeb985c:Convert SettingsGoogle to Android.bp
I3b8223e64:Export elmyra and columbus aidl files for Settings...
I3d2f042a9:Export proguard.flags, manifest and sources for us...

Change-Id: I9da85caeb3a53cf7ac3216c4b34985423b997fd2
2021-01-19 05:23:08 +00:00
Colin Cross
17e5233cdb Revert "Build Settings-robo-testutils for use by SettingsGoogleR..."
Revert submission 13183140-SettingsGoogle-bp

Reason for revert: b/177766209
Reverted Changes:
I73bef76ec:Add ArcSettings and SettingsGoogle to the legacy a...
I385629c5c:Build Settings-robo-testutils for use by SettingsG...
I863e1d658:Convert ArcSettings to Android.bp
If095bc39d:Convert SettingsGoogleRoboTests to Android.bp
I8d3f32cd4:Convert SettingsGoogle tests to Android.bp
I7ddeb985c:Convert SettingsGoogle to Android.bp
I3b8223e64:Export elmyra and columbus aidl files for Settings...
I3d2f042a9:Export proguard.flags, manifest and sources for us...

Change-Id: I2efd60ab1e64370dbd0e277b7e92c177374ceb36
2021-01-19 05:23:08 +00:00
SongFerngWang
c14eefb125 [Provider mode] Carrier item display network type on slice.
Bug: 176871752
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: I79b4c3d45a52f0be0c058044f1d79a7056386193
2021-01-19 12:23:22 +08:00
SongFerngWang
f3b25cc7cb The provider model slice carrier toggle is broke.
The slice doesn't upload subId for TelephonyManager and
the listeners.

Bug: 177385874
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: Icc8a7793204de2e2eadd0454edf50e466821b8f9
2021-01-19 11:58:58 +08:00
Bonian Chen
23ee815ef5 Merge "[Settings] Remaining part of Cross SIM calling (backup calling)" 2021-01-18 14:13:14 +00:00
Bonian Chen
26552500f6 [Settings] Remaining part of Cross SIM calling (backup calling)
1. Change the wording
2. Add a list of summary within Calls and SMSs UI

Bug: 174012397
Test: manual
Change-Id: I6dde0cea9c1386029377b3ea2682ed8b977f9427
2021-01-18 20:41:39 +08:00
Weng Su
1ab70837d2 Merge "[Provider Model] Connect carrier network issue fix" 2021-01-18 12:09:47 +00:00
TreeHugger Robot
c415e0d9cc Merge "Workaround Wi-Fi Settings NullPointerException" 2021-01-18 10:07:48 +00:00
Bonian Chen
7c22644825 Merge "[Settings] Initial config UI support for cross sim calling" 2021-01-18 09:49:04 +00:00
Weng Su
99eb12048c Workaround Wi-Fi Settings NullPointerException
- Add null pointer checking to avoid unexpected crash.

Bug: 177782266
Test: manual test
Change-Id: I2d9ce1777adbc80bb6c40b7bb830de12bb0a9748
2021-01-18 08:54:23 +00:00
Weng Su
99dbb43f0c [Provider Model] Connect carrier network issue fix
- Need to check if the data is enabled on the second SIM in the case of
dual SIM.

Bug: 177411771
Test: manual test
Change-Id: Ieead7a4550628d5380b8d0150cfd7a67c47980ca
2021-01-18 07:59:50 +00:00
Bonian Chen
5e12677d00 [Settings] Initial config UI support for cross sim calling
This is the initial configuration UI support for cross SIM calling.

Mock UI: https://docs.google.com/presentation/d/1u9eO9Fs2_kr1mqkzyVe-_iNldM6OBv4ucmhUTr3Z-0w/edit?resourcekey=0-siV3RVBkI_fjH8mMWHbtHg#slide=id.gb4a3581a82_0_0
Screenshot: https://screenshot.googleplex.com/3QX3Y6vAhBYv7LC

Bug: 174012397
Test: manual
Change-Id: Id96b72054bee9b3359e5336cc90acbff7e6d78ea
2021-01-18 15:36:27 +08:00