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
Julia Reynolds
c92e89217f
Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
am: 8e41734caf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272
Change-Id: I7d6153f6f46a116a3a25872dc422a59b02ffd1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 23:57:18 +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
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
Raphael Kim
8f32fa54f7
Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158
am: 197d19654f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002
Change-Id: Icdfe37ff28d24d37a7d62686656a837cb52a8419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 22:34:30 +00:00
Yuri Lin
7ac6bb4d61
Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a
am: 475ee039ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363
Change-Id: Ifa6599f54d191244c2dc1af47ce9a673d00e3a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 22:14:49 +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
Julia Reynolds
f5148fd0a7
Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
am: c80fc1ba4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272
Change-Id: I1fd64e19f44fa0df9eda4a921a3c15cf7f55db09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 21:14:25 +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
94355d5717
Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158
am: a36c5894ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002
Change-Id: I40e0de672046d74cc3fb131b841ceb2fc93b3456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:46:08 +00: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
c80fc1ba4d
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: I08f148210ade5545c070a88656909d4acb7becb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:40:45 +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
cd760beb21
Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949
am: 4859f6cfe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099
Change-Id: I089526c78250c1d6023a5495644ef7a2f2e9a9f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 19:35:46 +00:00
Yuri Lin
b855cf5d12
Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a
am: e010ba619e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363
Change-Id: I4c592a292608c0305a8a420d74c34311850f778f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 19:21:56 +00:00
Raphael Kim
a36c5894ba
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: I4cabf15ab73a28f4c154a1ebe0b7383b5658c3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:49:37 +00:00
Jason Chiu
bcf6dd1384
Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20
am: ccf066c663
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097
Change-Id: Iba7a7f7592368a38ea65b85ae3415c3ceaf62879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:45:53 +00:00
Chaohui Wang
556d73bfe0
Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949
am: e33539d629
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099
Change-Id: Ic2868b424c425ef96629271fe8890deecae228fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:41:32 +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
Tom Hsu
9ac7f3d212
Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702
am: d3341895ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093
Change-Id: I20a01a207ec8dd9a6477b32ed87e5d5603b6edb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:27:57 +00:00
Jason Chiu
1e4edfd3e2
Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20
am: 399093f82a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097
Change-Id: I4c82eb41791c196efba07df8d79a732ba70851b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:15:01 +00:00
Treehugger Robot
5b1b7d118e
[automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385
am: 34ca30adc7
-s ours am: d91f702ad0
-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: Ie46f25ab70dee6e0fcffe694ee9ae56dc8ae737e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 18:11:18 +00:00
Tom Hsu
c02919a597
Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702
am: b0eabfb352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093
Change-Id: Ib996f6dd1dbc2e96efbeabcfe2ee886afaf4b8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:56:18 +00:00
Tom Hsu
c064ad98fa
Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704
am: 6586310e62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645
Change-Id: I912e28a3b6803199ca5a1b50d25747a227b6db41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:56:08 +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
TreeHugger Robot
e42176705b
Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd
am: 0cfa226653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674
Change-Id: I16807d17cd07d160cf6bd3bbc7b3692d7f75108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:43:28 +00:00
Tom Hsu
a58343f800
Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704
am: 927b6c4f63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645
Change-Id: I642d026f2c56a7e2a91cfec47a60ecfa486195ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:42:42 +00:00
TreeHugger Robot
8c30f1b644
Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd
am: 4d7e960d65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674
Change-Id: Ic6678f708e53efe8d9c8942c0d2622819b5e365f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:41:39 +00:00
Chaohui Wang
89fa491c6d
Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f
am: 10f7493fe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095
Change-Id: I2ddd366a1b0f1293e8dc702c4484c103017374db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:41:23 +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
Kholoud Mohamed
b4117d0068
Merge "Add missing settings strings." into tm-dev am: 155df044e5
am: d5a0ee6a90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008
Change-Id: I6b426bb7e2e74e6ebf6894f893413c30389f6f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:29:37 +00:00
Chaohui Wang
0c38840066
Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f
am: b09fcd145d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095
Change-Id: If97feba5b063e5bc69a905ed5b96ab4d62838dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:15:08 +00:00
Kholoud Mohamed
98ce84f65b
Merge "Add missing settings strings." into tm-dev am: 155df044e5
am: e8aa31b017
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008
Change-Id: I63e5e4a2da6504aef9188a1bd9181d861c668f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:06:12 +00: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
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