Martijn Coenen
63db54c290
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev
2022-05-10 09:18:52 +00:00
Mattias Nilsson
36c71e9d47
Disable "SIM card lock" when the SIM card is PUK-blocked
...
For an inserted PUK-blocked SIM card we should not allow
to open lock settings. Add a check for SIM_STATE_PERM_DISABLED
and disable "SIM card lock".
Test: Insert a PUK blocked card and check SIM card lock
Bug: 230370597
Change-Id: I8b468cefe95fb8bd66ab91d6c4569ddb01473fbe
2022-05-10 10:46:56 +02:00
Menghan Li
f7b967ffd4
Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev
2022-05-10 08:42:32 +00:00
menghanli
4a35bf929a
Remove "Remove animation" assistive technologies in setup
...
Turn on "Remove animation" will cause setup flow becomes slow in response. The educational videos and animations (such as the ones used in onboarding) should NOT adopt "remove animation". Will postpone this feature until Android U.
Bug: 227284067
Test: Manual testing
Change-Id: I57f2d4513372e8deeabcd784896dc0ffbea145c8
2022-05-10 08:42:15 +00:00
tom hsu
420404f9e3
[Panlingual][Settings] Fix when tap search bar, will leave a big blank.
...
- Close blank layout after title disappear when search bar is expanded.
Bug: b/227287277
Test: local, see b/227287277#6
Change-Id: I1a61bab9a046aa52e22c4ef2292c7ae703deab1e
2022-05-10 08:30:18 +00:00
Tsung-Mao Fang
ca72e5c333
Merge "Disable setting items in App details page" into tm-dev
2022-05-10 08:17:57 +00:00
Bonian Chen
2d72d9f450
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev
2022-05-10 07:51:16 +00:00
TreeHugger Robot
3dcb2b65f7
Merge "Cancel bonding upon back gesture." into tm-dev
2022-05-10 06:31:28 +00:00
Chaohui Wang
80e74b7f0f
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I1348ca8869c1238a44f9a06dc278a6fae905d277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 06:26:08 +00:00
SongFerng Wang
b1613b210d
Merge "Reuse the active esim slot" into tm-dev
2022-05-10 06:25:07 +00:00
Bonian Chen
4c3dda2bbd
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: If7ce59c6a1557243d4e5f23fa3c1452ae7cb98e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:37:28 +00:00
TreeHugger Robot
baba62294b
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I95787dcf320489fa8b8b42b985c6a81a71eba27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:37:17 +00:00
Bill Yi
dff3f7f106
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-10 05:04:45 +00:00
Bonian Chen
d2c9581b44
[Settings] Broken test fix - SimStatusDialogControllerTest
...
Avoid from test broken - SimStatusDialogControllerTest
Bug: 232040460
Test: unit test
Change-Id: Id5cedd92f008df232234a19d9894e6eb8d39959d
2022-05-10 12:20:50 +08:00
Chaohui Wang
1107c1c220
Merge "Fix Voice Access scroll down in the Add network" into tm-dev
2022-05-10 04:15:07 +00:00
SongFerngWang
c389149ff3
stop show preferred SIM card dialog during sim switch
...
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-05-10 11:54:44 +08:00
Chaohui Wang
9b28ecf9de
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev
2022-05-10 02:44:47 +00:00
Bonian Chen
bd971968e9
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev
2022-05-10 02:25:51 +00:00
TreeHugger Robot
12f552f22e
Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: I02908155a6567d757b46901194f2633314da1543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 02:12:05 +00:00
Bill Yi
3abfb845b6
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
am: 63c72a9193
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: I94f24eb788a5336e4bedf83e21e9b3bb05f590b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 02:11:51 +00:00
TreeHugger Robot
cb38753530
Merge "Fix More details not work on fingerprint" into tm-dev
2022-05-10 02:09:51 +00:00
Arc Wang
640eab60f2
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:43:16 +00:00
Arc Wang
4b02b7dc7d
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:42:41 +00:00
Arc Wang
1682354551
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:42:05 +00:00
Bonian Chen
8b06c96fe9
[Settings] Hide some Preference entries when no mobile data support
...
Hide some Preference which requires mobile data on device didn't support
it.
Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
2022-05-10 01:12:23 +00:00
Jack He
3671fb8438
Merge "Cancel bonding upon back gesture."
2022-05-10 00:09:48 +00:00
Android Build Coastguard Worker
d7211732ec
Snap for 8561975 from c6f7599158
to tm-release
...
Change-Id: Iddb61c3dfd06673cba36811c2dc4e07bc1f17958
2022-05-09 23:09:04 +00:00
Yanting Yang
ee0931f5ba
Fix reset app preferences for work profile apps
...
In the past, Settings didn't support resetting the disable status of
work profile apps, it doesn’t follow the behavior that the reset dialog
mentioned.
To fix it, we are going to check apps by enabling user profiles and user
id. If the work profile is enabled, we will also reset them when users
select to reset app preferences.
Bug: 187387211
Test: manual
Change-Id: I25fd0129335539a23ed2ee0af57fdd9714eddf74
2022-05-10 07:06:14 +08:00
TreeHugger Robot
94061be6ee
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-09 23:02:44 +00:00
TreeHugger Robot
f1167898b7
Merge changes from topic "tc_change_20" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
Import translations. DO NOT MERGE ANYWHERE
2022-05-09 23:02:43 +00:00
Julia Reynolds
8e41734caf
Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272
Change-Id: Ifb623c3650ae1c46efa0485979f412b80896b11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 21:48:00 +00:00
Qasim Javed
78765b0b26
Cancel bonding upon back gesture.
...
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.
The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
Merged-In: Ia790e345be811be1b60762ff819544d03c5a18fd
2022-05-09 13:55:52 -07:00
Raphael Kim
197d19654f
Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002
Change-Id: Idecf480854d722ec9149a8a721c7219b377508b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:41:48 +00:00
Julia Reynolds
23a85a1f96
Merge "Remove notification permission feature flag" into tm-dev
2022-05-09 20:16:09 +00:00
Qasim Javed
0521856683
Cancel bonding upon back gesture.
...
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.
The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
2022-05-09 13:11:13 -07:00
Yuri Lin
475ee039ea
Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363
Change-Id: Iad403489e803122d5642622b72bfa014adbe4f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 19:52:15 +00:00
Chaohui Wang
4859f6cfe1
Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099
Change-Id: I11444e18e07dc8ee33c4d079f15c62dd1cb72c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:35:26 +00:00
Raphael Kim
c6f7599158
Merge "Extract app label from component name in notification access confirmation UI" into tm-dev
2022-05-09 17:55:06 +00:00
Jason Chiu
ccf066c663
Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097
Change-Id: I37ce935f16618f31bca16615ab92d1903a9283c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:46:00 +00:00
Tom Hsu
d3341895ee
Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093
Change-Id: I6a4ecc8c4d96650aca4dc1d31dbc14ffc738b785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:34:41 +00:00
Bonian Chen
e0f1081739
[Settings] IMS feature checking before accessing VT IMS API
...
Check IMS feature before accessing VT IMS API.o
Bug: 231248315
Test: local
Change-Id: I01b438cc79bb91ca05ba6bf57c7e38eb06e51a98
2022-05-10 01:32:31 +08:00
SongFerngWang
42aa247383
Reuse the active esim slot
...
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.
Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-05-10 01:04:20 +08:00
Treehugger Robot
d91f702ad0
[automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385
am: 34ca30adc7
-s ours
...
am skip reason: Merged-In Id055fbd441936a9842b4acc978a894a855165bb7 with SHA-1 0f68faf996
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092023
Change-Id: Ida4669176528ddfbdfc12c1dc4c7dfb00de3d692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:59:10 +00:00
Ramneek Kalra
800152033e
[ALPSxxxxxxxx] Storage view is white and cannot show any info
...
Storage view is white and cannot show any info while plug in/out u disk because the visibility of list view is gone.
This visibility is set when StorageDashboardFragment.java sets loading using API setLoading.
In error condition setloading was not called due to conditional statement.
After removing the conditional statement, it sets loading through which visibility of the list view is set to VISIBLE.
1. Enter Settings->Storage
2. Plug in U-disk, storage view will start updating
3. During storage view updating, plug out U-disk(before phone recognized and show U-disk)
Fix:
Bug:
Test:
Change-Id: Id7350909b614bbe9264910cab3cdeca616544618
CR-Id:
Feature:
2022-05-09 22:20:35 +05:30
Tom Hsu
6586310e62
Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645
Change-Id: If3d7723dc8940bd56468fc9f0096d3e08b0d7d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:46:28 +00:00
TreeHugger Robot
0cfa226653
Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674
Change-Id: Id5fbd19d879c5dfb194ab51cf23da132e3eec8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:43:39 +00:00
Chaohui Wang
b09fcd145d
Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095
Change-Id: Ib2bd1300cd59f3e85a49fea11de643f5fc7f268e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:42:27 +00:00
Treehugger Robot
34ca30adc7
Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092023
Change-Id: I198290510e8adda1198663beb90e8501f785c6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:22:13 +00:00
Treehugger Robot
2da70f6385
Merge "[Settings] Avoid from crash UI when querying data usage"
2022-05-09 15:46:46 +00:00
Kholoud Mohamed
e8aa31b017
Merge "Add missing settings strings." into tm-dev am: 155df044e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008
Change-Id: Ia10c0e0d30ab654a9ad3759ba65887dcdd8ffb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:19:17 +00:00