Betty Chang
448afb8386
Merge "[LE Audio] Only add main device for LE Audio devices in Take call on list" into tm-qpr-dev am: 3030e61265 am: 70278a9c98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265111
Change-Id: I5e84877322566ae68f4d3355c7967a870a24c459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 07:13:28 +00:00
Betty Chang
70278a9c98
Merge "[LE Audio] Only add main device for LE Audio devices in Take call on list" into tm-qpr-dev am: 3030e61265
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265111
Change-Id: Ieb9cdefc4fd9f58c0fa75185986e5d71f9a5f495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 06:36:08 +00:00
Betty Chang
3030e61265
Merge "[LE Audio] Only add main device for LE Audio devices in Take call on list" into tm-qpr-dev
2022-10-25 06:07:18 +00:00
Chaohui Wang
851dbecdd4
Merge "Add HibernationSwitchPreference for Spa"
2022-10-25 03:45:09 +00:00
Chaohui Wang
af97082f9b
Add HibernationSwitchPreference for Spa
...
Bug: 236346018
Test: Manual with App Info page
Test: Settings Unit tests
Change-Id: I23140a2a16b3b5a4b569623504b1838a641611fe
2022-10-25 09:08:14 +08:00
Bill Yi
2f684ca60f
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-10-24 22:22:08 +00:00
Roman Kalukiewicz
009945a337
Merge "Change the "Blocked by IT admin" to use family related dialog for children."
2022-10-24 15:23:51 +00:00
Shaowei Shen
a86576b975
Merge "[Sound Panel] Fix bugs for sound panel slice" into tm-qpr-dev am: 02cf722b24 am: 713aa67d90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19636172
Change-Id: I02cd0836aca7e7cb6c2583c3aee4b5dadaddf137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-24 13:53:08 +00:00
Shaowei Shen
713aa67d90
Merge "[Sound Panel] Fix bugs for sound panel slice" into tm-qpr-dev am: 02cf722b24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19636172
Change-Id: Ia485be78358748e474650b76c3035d8787a3d33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-24 13:20:55 +00:00
Shaowei Shen
02cf722b24
Merge "[Sound Panel] Fix bugs for sound panel slice" into tm-qpr-dev
2022-10-24 12:43:06 +00:00
TreeHugger Robot
521f675bea
[automerger skipped] Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3cb am: dda18d1d8c -s ours
...
am skip reason: Merged-In I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25 with SHA-1 160b5078ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20244146
Change-Id: I110a8c6949f86bcc370d95760a5a94d0f2e6249e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-24 09:38:15 +00:00
changbetty
abc69c34de
[LE Audio] Only add main device for LE Audio devices in Take call on
...
list
Bug: 254212589
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AudioOutputSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HandsFreeProfileOutputPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I7831f12ca259aac3d60f4370ffc659a32fed3296
2022-10-24 06:52:03 +00:00
TreeHugger Robot
dda18d1d8c
Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20244146
Change-Id: I7b3275ffad2af79bb81c3761b691ab793a61168a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-24 03:26:46 +00:00
TreeHugger Robot
87d2f6d3cb
Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev
2022-10-24 03:04:59 +00:00
Bonian Chen
d9ea5b0692
Merge "[Settings] configuration for hidding SIM notification UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
6eb3f717b8
Merge "[Settings] configuration for hidding SIM lock UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
71db4e8732
Merge "[Settings] configuration for hidding SIM remove UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
210fba096f
Merge "[Settings] configuration for hidding SIM provider UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
d07157691e
Merge "[Settings] configuration for hidding SIM settings UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
a4aca19f8f
Merge "[Settings] configuration for hidding SIM related UI"
2022-10-21 13:29:18 +00:00
TreeHugger Robot
98f3e24171
Merge changes from topic "tc_change_22102020_15"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dece402e5a
Import translations. DO NOT MERGE ANYWHERE
2022-10-21 13:10:24 +00:00
Chaohui Wang
fd9997f156
Merge "Add DefaultAppShortcuts for Spa"
2022-10-21 11:09:46 +00:00
Bonian Chen
7c3f04aa11
[Settings] configuration for hidding SIM lock UI
...
Hide SIM lock UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
2022-10-21 10:59:11 +00:00
Julia Reynolds
1d54859168
Update category to intent action
...
Test: settings unit tests
Bug: 254339351
Change-Id: I6c4bfb474408cd9ab95ae3fbd80a89760a4b7844
2022-10-21 10:09:02 +00:00
Bonian Chen
5dae24208b
[Settings] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Change-Id: I8d7ddd18861a696830da39f040dfb14b9ed46726
2022-10-21 09:21:59 +00:00
TreeHugger Robot
5702ae9f1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f25d55b33f -s ours am: 9883578f80 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246827
Change-Id: I3a307488f30ab902e8e9ba664dcb010064971794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:45:17 +00:00
Bill Yi
fa81d69fe6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99adb84106 -s ours am: fb4c4d64a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246827
Change-Id: I9cb0ff42a1d466315dae57e9491e0e1321e327be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:44:53 +00:00
Philip Junker
638693c203
Merge "Only list apps with android.permission.TURN_SCREEN_ON."
2022-10-21 08:13:09 +00:00
TreeHugger Robot
9883578f80
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f25d55b33f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246827
Change-Id: Iec679af0f35dc4ac39fd6e3c6fb2eb7496cf51a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:00:43 +00:00
Bill Yi
fb4c4d64a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99adb84106 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246827
Change-Id: I30b195f036e43e15c9a90ffe4b25c22075595366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:00:08 +00:00
Chaohui Wang
a8e19e0f2c
Add DefaultAppShortcuts for Spa
...
Including the following,
- Home app
- Browser app
- Phone app
- Emergency app
- SMS app
Bug: 236346018
Test: Manual with App Info page
Test: Settings Unit tests
Change-Id: I4ceb31ed521b758a6f91d7e86fd34c780442b1ac
2022-10-21 15:43:12 +08:00
TreeHugger Robot
f25d55b33f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-21 07:30:44 +00:00
Treehugger Robot
b267f66627
Merge "network: fix binder object leakage in settings" am: bdcd3a3975 am: 5408baabdd am: 00f25b5d5f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792
Change-Id: I344cc9da6dfbb456c258ea96d9d9b47a5dac67d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 05:07:24 +00:00
Kuan Wang
cbaffa34bc
Add functions of SI DatabaseUtils into Settings DatabaseUtils and remove
...
unused functions.
Bug: 253395332
Test: make RunSettingsRoboTests
Change-Id: I61feee3386d7291f9174acb884d09d7ab8733511
2022-10-21 04:48:14 +00:00
Kuan Wang
c7afa45eac
Clean up unused function getHideApplicationSummary in
...
PowerUsageFeatureProvider.
Bug: 253395332
Bug: 254769892
Bug: 254769770
Test: make RunSettingsRoboTests
Change-Id: I6acf0cbdb7321934e85939e0acee567001107a17
2022-10-21 04:42:06 +00:00
Treehugger Robot
00f25b5d5f
Merge "network: fix binder object leakage in settings" am: bdcd3a3975 am: 5408baabdd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792
Change-Id: Ic7d0893d3c7793f000db51183cbce0ad49765805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 04:34:57 +00:00
Bill Yi
4edbcb414c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dece402e5a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246318
Change-Id: I674f1acd6a1dc654ac9266719ac40435db5e65e2
2022-10-21 03:59:05 +00:00
Treehugger Robot
5408baabdd
Merge "network: fix binder object leakage in settings" am: bdcd3a3975
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792
Change-Id: I141693097ed912ff223b3be3fa997a51b6713ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 03:52:48 +00:00
Treehugger Robot
bdcd3a3975
Merge "network: fix binder object leakage in settings"
2022-10-21 03:25:39 +00:00
Milton Wu
eff9effb25
Merge "Retry fingerprint or face unlock" into tm-qpr-dev am: c1d0d230d4 am: 96f959737c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188600
Change-Id: I9c05b7bf43304fead4ae03a23a5106afe55612f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 02:12:23 +00:00
Milton Wu
96f959737c
Merge "Retry fingerprint or face unlock" into tm-qpr-dev am: c1d0d230d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188600
Change-Id: I24e093bb5dac1fcce152a85b332a19c3df5aa77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 01:41:51 +00:00
Milton Wu
c1d0d230d4
Merge "Retry fingerprint or face unlock" into tm-qpr-dev
2022-10-21 01:08:37 +00:00
Bill Yi
99adb84106
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib20c6175cf2df8ca8b58ce76b04aa32ec2951c97
2022-10-20 12:48:24 -07:00
Bill Yi
22fa29b118
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e9f3b9525cfc5adcc87f0d70bd89fa390dbe151
2022-10-20 12:44:50 -07:00
Bill Yi
dece402e5a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I814f8120bdf869f96b51ccedf7d1fa737740bb06
2022-10-20 12:38:38 -07:00
Tetiana Meronyk
9183d06d41
Merge "Show other users in storage settings"
2022-10-20 16:20:41 +00:00
TreeHugger Robot
fbf9c8fee6
Merge "Fix UwbPreferenceControllerTest"
2022-10-20 14:49:30 +00:00
Bonian Chen
2f07595eb0
[Settings] configuration for hidding SIM provider UI
...
Hide SIM provider UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
2022-10-20 11:35:28 +00:00
Bonian Chen
504e71c284
[Settings] configuration for hidding SIM notification UI
...
Hide SIM notification UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I07d9ddeb96ca590decf28126ce97fba4c1783304
2022-10-20 10:11:11 +00:00
Bonian Chen
69f6e76f2c
[Settings] configuration for hidding SIM remove UI
...
Hide SIM remove UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
2022-10-20 09:59:01 +00:00