Commit Graph

45341 Commits

Author SHA1 Message Date
Bonian Chen
99698c344c Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1 am: 5f5bcf56ca am: 6b6287111f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204

Change-Id: I65b87ec068d0b5ce0948937604f71ccb4ba6e6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 09:50:23 +00:00
Bonian Chen
6b6287111f Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1 am: 5f5bcf56ca
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204

Change-Id: I9bcb0366eee69b9345b6dbd6209d627fe67c31f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 09:16:42 +00:00
Bonian Chen
5f5bcf56ca Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204

Change-Id: Icece91f8119388bbf7bca7129b9f077bc0c857a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 08:32:33 +00:00
SongFerng Wang
4e151185a7 Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev am: 3767112332 am: 29caa8e0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176388

Change-Id: Ib1dcb8c150cb8123c5dc2475839d49f97e792c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 07:07:16 +00:00
SongFerng Wang
29caa8e0f4 Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev am: 3767112332
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176388

Change-Id: I9e77d96cd60eff8f7feb5f257bd05979f49e345a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 07:04:20 +00:00
SongFerng Wang
3767112332 Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev 2022-10-19 05:12:22 +00:00
Zoey Chen
ced43b33f2 Merge "[Settings] Change the way in NetworkProviderCallsSmsController for getting the subscription info from room db part2" 2022-10-19 04:29:21 +00:00
Kuan Wang
b036cfabd6 Merge "Copy DatabaseUtils from SettingsGoogle to Settings and use the new Settings database." 2022-10-19 02:20:16 +00:00
Kuan Wang
547df61667 Copy DatabaseUtils from SettingsGoogle to Settings and use the new
Settings database.

Bug: 253395332
Test: make RunSettingsRoboTests
Change-Id: Idbe6d71b69b28d344db146d139b4b60e2e7434da
2022-10-19 02:20:00 +00:00
Kuan Wang
fb136dd8d5 Copy BatteryUsageLoaderService and BatteryBroadcastReceiver from
SettingsGoogle to Settings and rename them to BatteryUsageDataLoader and
BatteryUsageBroadcastReceiver.

Bug: 253395332
Test: make RunSettingsRoboTests
Change-Id: Ide7c572a7df826ca576223c297b8ec78c45cc94e
2022-10-19 02:19:57 +00:00
Bonian Chen
7364b9bbe3 [Settings] align the long press behavior on secondary sim
Within Settings app, long press allows user to copy status/summary part
when it comes to first SIM.

This is a commit to enable the same feature on the second sim.

Test: local
Change-Id: I58d9cf9cbba213196536781d41b9ec81c0142960
2022-10-19 01:47:11 +00:00
Treehugger Robot
772c437de4 Merge "Fix crash when input illegal proxy port number" am: e8160af796 am: 6372ae5e93 am: ab0dc7b129
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Ia9db49f176a65bb2d512cd7e0694284f03414a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 21:43:26 +00:00
Treehugger Robot
ab0dc7b129 Merge "Fix crash when input illegal proxy port number" am: e8160af796 am: 6372ae5e93
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Ida3089a2375e04b653058b380c2fd9f1f56a9fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 21:10:26 +00:00
Treehugger Robot
6372ae5e93 Merge "Fix crash when input illegal proxy port number" am: e8160af796
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Idc35fa976db5cfde013ec9c32191869e84c7801f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 20:42:36 +00:00
Treehugger Robot
e8160af796 Merge "Fix crash when input illegal proxy port number" 2022-10-18 20:17:08 +00:00
Julia Reynolds
b495103ca7 Merge "Add link to more app settings" 2022-10-18 19:32:27 +00:00
Lucas Silva
947bf37e31 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad am: 5067d29ba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: Id7b947a04e655fe5d6e8b98c2fb8857be4cfb256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 18:15:24 +00:00
Lucas Silva
5067d29ba4 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: I72ec38de9b99e704d909ddf9e21e7ac825b00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 17:43:35 +00:00
Lucas Silva
6a8e193fad Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev 2022-10-18 17:17:25 +00:00
Lucas Silva
51f838ba4b Update dream summary when dream suppressed by bedtime mode
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
2022-10-18 13:23:49 +00:00
TreeHugger Robot
4c96ab379b Merge "Add indexable setting items" 2022-10-18 10:10:08 +00:00
Tsung-Mao Fang
bd2ee1e20a Add indexable setting items
When work profile is supported on the device,
we should support work profile releated setting items.

Fix: 238055360
Test: Manual
Change-Id: I5b952f958d0c5fc0f7b22838e1f7cfc36239a22e
2022-10-18 16:03:43 +08:00
SongFerng Wang
0693ac7282 Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef am: bd476febf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277

Change-Id: I932293c24499b93666686f47907244f8a472243c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 07:20:43 +00:00
SongFerng Wang
bd476febf0 Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277

Change-Id: Ib62e9adf0e2bdac25821c9f70634c27b26515056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 06:50:09 +00:00
SongFerng Wang
2cd07f51ef Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev 2022-10-18 06:30:34 +00:00
Zoey Chen
605754eff3 [Settings] Change the way in NetworkProviderCallsSmsController for getting the subscription info from room db part2
Bug: 236919685
Test: atest NetworkProviderCallsSmsControllerTest
Change-Id: Ibbfa1fed15ea4fa38cff38d78855326e3d74fe0e
2022-10-18 06:14:54 +00:00
Treehugger Robot
c89a3c4c6a Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 am: 24e8db3335 am: 5e52bc9c74
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I6925c8b37ce09c36f054aa574154581097ca974c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 05:40:46 +00:00
Treehugger Robot
5e52bc9c74 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 am: 24e8db3335
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I506f283c0dccadcc940245195d5112ca7ec4c154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 05:09:53 +00:00
Treehugger Robot
24e8db3335 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I34ec41a3b0cd28029595e70164501dd1350e96b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 04:42:26 +00:00
Kuan Wang
d16201a375 Merge "Copy BatterySettingsContentProvider from SettingsIntelligence to Settings and rename it to BatteryUsageContentProvider." 2022-10-18 02:26:48 +00:00
Kuan Wang
0a0ba915ca Copy BatterySettingsContentProvider from SettingsIntelligence to Settings and rename it to BatteryUsageContentProvider.
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ib6c2240cd065f6e29393e13b7231bba7afd2d850
2022-10-18 02:26:23 +00:00
Kuan Wang
f41ae57f17 Copy Battery Usage Database from SettingsIntelligence to Settings.
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ibdd2ace10d9e0893b3d96b345d563307b1890df6
2022-10-18 02:26:18 +00:00
Shen Lin
a911e61ce7 Fix crash when input illegal proxy port number
Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
2022-10-18 09:18:57 +08:00
Julia Reynolds
9ef3cf2572 Add link to more app settings
Test: MoreSettingsPreferenceControllerTest
Test: test app that can handle the settings intent
Bug: 236932102
Change-Id: Iae778c93057e47aa0f664d3faab21640b2cd5193
2022-10-17 13:59:31 -04:00
Julia Tuttle
6f25e6afca Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb am: 8416222c25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: If8d5df779d82d0064a5cdec5d59c119fb8b404a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 16:13:04 +00:00
Julia Tuttle
8416222c25 Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 16:07:43 +00:00
Julia Tuttle
5d780a42eb Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev 2022-10-17 14:56:20 +00:00
Zekan Qian
5d68c3f7b0 Merge "Use new API of SpaEnvironmentFactory." 2022-10-17 05:13:19 +00:00
Zoey Chen
f8eb29606b Merge "[Settings] Change the way in MobileNetworkSummaryController for getting the subscription info from room db" 2022-10-17 03:12:08 +00:00
Zekan Qian
f1311f800e Use new API of SpaEnvironmentFactory.
Test: manual - build Settings
Change-Id: I1cd5d7297687b6373a0044f8a100dd968b91e657
2022-10-17 02:49:11 +00:00
Shen Lin
72e5a7ea21 Fix crash when showing error dialog in NetworkRequestDialogActivity
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
2022-10-17 09:30:16 +08:00
Chaohui Wang
507e5f8c90 Fix some errors for Settings project
Attrs could not have same name, so create a common parent for the
messageText. And BiometricEnrollCheckbox is not in use.

Replace some com.android.settingslib.R with com.android.settings.R,
because these are files in settings instead of settingslib.

Bug: 253772249
Test: TAP
Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
2022-10-16 14:14:02 +08:00
Betty Chang
15066fe36e Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45 am: 90a1263b87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143

Change-Id: I535cbd8acbf40182f2f43df27b56462cc24674bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-15 05:37:12 +00:00
Julia Tuttle
e9108aecd8 Default to hiding silent notifications on lockscreen in Settings
Also, fix an errorprone issue.

Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
2022-10-15 01:24:19 -04:00
Betty Chang
90a1263b87 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143

Change-Id: I207add249654cc4963ee065b0b161e94c24e9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-15 05:03:37 +00:00
Betty Chang
b2269caa45 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev 2022-10-15 04:38:00 +00:00
Julia Tuttle
431d967b6d Fix some out-of-order imports am: 9f0efa68a1 am: 16b7c91e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425

Change-Id: I7ac72e785fff82674f3bf47546044ab92a0acf74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 19:50:17 +00:00
Julia Tuttle
16b7c91e5e Fix some out-of-order imports am: 9f0efa68a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425

Change-Id: I85de5768359802bd1800bc88b7ab490631c280e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 19:03:13 +00:00
Zoey Chen
a87affdb82 [Settings] Change the way in MobileNetworkSummaryController for getting the subscription info from room db
Bug: 236919685
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest
Change-Id: If417b792224261ad1965196d3675f28f55448fd6
2022-10-14 12:19:16 +00:00
TreeHugger Robot
981458c8ac Merge "Refine the check restriction function in WifiEntryPreference" 2022-10-14 07:44:21 +00:00