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
Jason Chiu
3aec52141d
Shorten the search box hint for two-pane layout
...
Change from "Search settings" to "Search".
Fix: 248006011
Test: visual
Change-Id: I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c
2022-10-19 13:34:48 +08: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
Xuanang Zhao
9da4302a78
Merge "Clean up ignored tests in Settings Slices provider."
2022-10-18 09:12:31 +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
Xuanang Zhao
50f229903e
Clean up ignored tests in Settings Slices provider.
...
Change-Id: Iad9102a5d23333d64976e0697f9438bccc77af0a
Bug: 253386051
2022-10-18 07:07:00 +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
Treehugger Robot
d791f7b967
Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity"
2022-10-18 04:09:49 +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
Bill Yi
234689945d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-10-17 23:33:02 +00: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
TreeHugger Robot
c5bd4228c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa81e2257
-s ours am: 88706bbf97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203925
Change-Id: I848c62ee0ff1a18dc0a1f1b88bfbfd006fbd317f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:42:53 +00:00
Bill Yi
94645cc6a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10685ce812
-s ours am: a3e06bcc92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203925
Change-Id: I112df70369157b1cb5fce2be29668fc15b71767d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:42:46 +00:00
TreeHugger Robot
367bf4c948
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5aa59588f2
-s ours am: 49322b60f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203923
Change-Id: I9cc4721af71aea213a090fe4e115dc59e1be3101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:42:30 +00:00
Bill Yi
c80cac6011
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b6197643d
-s ours am: 40aa9f76b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203923
Change-Id: I88312c9a2bcee505fc988854a24ab33a99659d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:42:12 +00:00
TreeHugger Robot
88706bbf97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa81e2257
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203925
Change-Id: Iff9e0babe8321174232ab58bf04271d4694edad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:39:14 +00:00
Bill Yi
a3e06bcc92
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10685ce812
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203925
Change-Id: Ia3b9a8ad96a76b8f49f308087532b8511cb153e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:38:52 +00:00
TreeHugger Robot
49322b60f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5aa59588f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203923
Change-Id: I6049cffd60de136acddb4a8b3331968794605d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:38:36 +00:00
Bill Yi
40aa9f76b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b6197643d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203923
Change-Id: I1ba7fba17edc02926600f15d63a1ea2680aa1e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:38:16 +00:00
TreeHugger Robot
0f3b9178f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f59720e026
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203160
Change-Id: Icc6f3a7d8a35a2d1c059b186ba460e16fe226382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:10:02 +00:00
Bill Yi
5dc8286068
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 46d8824ca9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203160
Change-Id: I8b1b8b7f787bae2de9370e5039778b2903051fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 17:09:55 +00:00
TreeHugger Robot
f6908a2221
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-10-17 16:50:32 +00:00
TreeHugger Robot
2fa81e2257
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-17 16:49:37 +00:00
TreeHugger Robot
5aa59588f2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-17 16:49:37 +00:00
TreeHugger Robot
f59720e026
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-10-17 16:38:05 +00:00
TreeHugger Robot
6966e0c225
Merge changes from topic "tc_change_22101519_25"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: de36845714
Import translations. DO NOT MERGE ANYWHERE
2022-10-17 16:38:04 +00:00