Commit Graph

116956 Commits

Author SHA1 Message Date
Diya Bera
f15f443ce5 Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c75 am: da8c78f093
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20249709

Change-Id: I78baceb039e99545ae5abf9f0c54606188d621b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 21:46:44 +00:00
Diya Bera
da8c78f093 Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20249709

Change-Id: If6de61542beed2a43d775a0b3706b11a95b5160b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 21:07:53 +00:00
Diya Bera
d66e0c4c75 Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev 2022-10-25 20:29:24 +00:00
TreeHugger Robot
e3e6b7e76f Merge "Remove string "snoop" from UI" 2022-10-25 11:21:17 +00:00
Betty Chang
50b3bdf7ea Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev am: a7b9107027 am: 6d2a0cdf0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271146

Change-Id: Ia8a43105afc093c28f3aa06877b72f7ef9d17ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 10:00:54 +00:00
Betty Chang
6d2a0cdf0d Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev am: a7b9107027
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271146

Change-Id: I742b41599ca0d33c7f6c33bb607a8bf89406cb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 09:23:57 +00:00
Treehugger Robot
4b705596cf Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4eb am: c54246e0c8 am: c2a1326104
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2263782

Change-Id: Iab157dbabcc85ce9f3b777729f450b5fa4a104eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 09:10:20 +00:00
Betty Chang
a7b9107027 Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev 2022-10-25 08:49:56 +00:00
Treehugger Robot
c2a1326104 Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4eb am: c54246e0c8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2263782

Change-Id: Ic0349cd744ffc1b32b46838c28d3aba600f7172a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 08:32:48 +00:00
Treehugger Robot
67ad9cd299 Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a am: 9fd4f504e2 am: ed7625f667
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267745

Change-Id: Ia6ab091fe54a028239c165060590014b0ccb79ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 08:20:33 +00:00
Treehugger Robot
c54246e0c8 Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4eb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2263782

Change-Id: I3d0a338bb220705a255a7abc123d490ee19f44af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 08:01:42 +00:00
Treehugger Robot
ed7625f667 Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a am: 9fd4f504e2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267745

Change-Id: I2de6c43683b2bb0b6473e3623415237f046408bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 07:43:25 +00:00
Treehugger Robot
fcd941b4eb Merge "Ensure search highlight position when scheduled runnable starts" 2022-10-25 07:35:26 +00:00
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
Treehugger Robot
9fd4f504e2 Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267745

Change-Id: I8a6caaabac8c6e718bb52edcf8c390ca22dd579c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 07:11:48 +00:00
Jack Yu
60eda146c6 Remove string "snoop" from UI
Based on the suggestion from privacy team, remove the string "snoop"
from UI.

Bug: 204397062
Test: build pass
Change-Id: I5af03f5160c8d81aab0f731bc105848588403318
2022-10-25 15:08:58 +08: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
Treehugger Robot
8959f0698a Merge "Fix typo in WifiCallingSettingsForSub" 2022-10-25 06:30:47 +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
Shen Lin
f20f8bc71a Fix typo in WifiCallingSettingsForSub
test: compile pass
Change-Id: I719a9a634a3b321533462f8e9fef9c183c042335
2022-10-25 11:37:04 +08: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
Diya Bera
9e1649273f Remove flicker during fingerprint enrollment
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 247581748
Change-Id: I7e456670fa0a8527f47bd8057fb755c0c2c1eeeb
2022-10-24 22:21:58 +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
changbetty
4f42ca1eac [LE Audio] Remove the broadcast icon when the device does not support
broadcast feature

Bug: 254743785
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputIndicatorWorkerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I02e429b3a306e2f9b0e2342118649208617c4944
2022-10-24 12:03:23 +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