Commit Graph

2494 Commits

Author SHA1 Message Date
SongFerng Wang
782bb2f069 Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268

Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 09:29:21 +00:00
SongFerngWang
88717f2c3f Avoid ANR when UI query network selection state
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
2023-03-20 14:42:18 +08:00
Treehugger Robot
3c62dd3543 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I8ec06e45f02f48bfec30051159ed8a931a11e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 16:27:37 +00:00
Treehugger Robot
c8a58a249d Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 15:53:41 +00:00
Treehugger Robot
821e70ea59 Merge "Adb is disconnecting during Monkey Test Run." 2023-03-10 15:19:15 +00:00
Maciej Żenczykowski
7e21dec65e Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I68e8a5898af8426250e1f0eb2d187e977f82dd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 04:15:54 +00:00
Maciej Żenczykowski
f73112b56e Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I3976958e427d18b9b5c3d6ce59cb45969145fa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 03:41:54 +00:00
Patrick Rohr
6f9062297f settings: allow enabling ethernet tethering independent of link state
A user should be able to enable tethering even if the interface does not
have link yet. Therefore, the toggle should be active if any interface
is available, independent of its link state.

Test: TH
Bug: 234036868
Change-Id: I2ae25207a766d71217dd6d17f3f9b74ceb261238
2023-03-08 00:57:03 +00:00
SongFerng Wang
d427c0d2d1 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540

Change-Id: I30a31add9ce0d6c8493edf162b57d80b03e4ef5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:15:07 +00:00
Bonian Chen
28367dae4d [Settings] Customizable resource for hiding 3G preferred network type
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.

Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local

Merged-In: I8092372372cb334b5ac1956b869d194b9fcd0523
Merged-In: I5c12ad23a240fbe70630855e5f98b5be83912674
Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
2023-03-02 10:47:00 +00:00
SongFerng Wang
327ae0d6db Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev am: be84e27612
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21328340

Change-Id: I013418971db0db3a3e64895423063a88aac3c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 02:55:44 +00:00
SongFerngWang
e85bb5058d Add a config to hide the 3G option at preferred network mode UI
Add a config config_display_network_mode_3g_option to hide the 3G
option at preferred network mode UI

Bug: 261615630
Test: build pass. local test pass.
atest EnabledNetworkModePreferenceControllerTest

Change-Id: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
(cherry picked from commit f7685dd715)
Merged-In: I4f94971add1d1eddc9f7c7458b8fc8fdcec3935e
2023-02-08 07:41:13 +00:00
Zoey Chen
245def5cad [Settings] Add the CarrierNetworkChange case am: ba7418ecd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312559

Change-Id: Ie5927ffa717e26bc452c74f5ddb94f84720e9b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 13:31:29 +00:00
Zoey Chen
ba7418ecd7 [Settings] Add the CarrierNetworkChange case
Bug: 262927206
Test: atest SubscriptionsPreferenceControllerTest
Change-Id: If7eeb185224179d59ab841af0062ec5b98b956e9
Merged-In: If7eeb185224179d59ab841af0062ec5b98b956e9
2023-02-07 10:48:30 +00:00
Bonian Chen
b079eb6287 Merge "[Settings] Reduce CDMA API access when not required" into tm-qpr-dev am: 147669c893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20893163

Change-Id: Iac1f7f8b5de6d6a50591170637c62f379fa6c1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 03:55:55 +00:00
Bonian Chen
147669c893 Merge "[Settings] Reduce CDMA API access when not required" into tm-qpr-dev 2023-01-19 03:21:27 +00:00
SongFerng Wang
40838101dd Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev am: f71b548285
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20973543

Change-Id: Iff0e0f03886e414c36d508e5b17541514c1171f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-16 08:21:26 +00:00
SongFerng Wang
f71b548285 Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev 2023-01-16 07:44:37 +00:00
SongFerng Wang
fe5978cde1 Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"
This reverts commit 078ecbd765.

Reason for revert: The in-market device have error by some unknown reasons at b/264371574. To revert it, then the settings wait the 25s, it can protect the system has enough time for enabling esim.

Change-Id: Ic17380f549c764306851ad5cba6360f68df9b9b5
2023-01-13 04:18:34 +00:00
Bonian Chen
4785c8a7ec [Settings] Reduce CDMA API access when not required
Avoid from accessing CDMA roaming API to reduce some latency on UI.

Bug: 263294530
Bug: 264656126
Test: local

Change-Id: I5c74636d8418a379724676e1f854c8adff5d4387
Merged-In: I5c74636d8418a379724676e1f854c8adff5d4387
2023-01-11 08:58:31 +00:00
Treehugger Robot
8a26d010d0 Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee am: 24835ea2f9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884

Change-Id: Ie89e48f670b7e3cc8d8d607149d35c678b67ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 12:59:37 +00:00
Ankit Agrawal
5bff5f3868 Adb is disconnecting during Monkey Test Run.
When running the monkey test, its going in tethering page
inside Settings app and enabling ethernet tethering.
Due to get adb connection is getting lost.

Guarding ethernet tethering option when monkey test is running,
it will not display ethernet tethering option during monkey test.

Bug:
Test: start monkey test run using below command
adb shell monkey -v 1000000

Change-Id: I4040cb088404e663b032179ff52b1bc564ecf76b
Signed-off-by: Ankit Agrawal <ankit.agarwal@intel.com>
2022-12-13 21:24:11 +05:30
Shen Lin
f677ee600a Align SETTINGS_PACKAGE_NAME reference to a single place
This CL migrated some fragmented declarations of Settings packageName.
When we want to referece package name of Settings, we prefer using
Utils#SETTINGS_PACKAGE_NAME.

Bug: 262123382
Test: make Settings -j64
Change-Id: Ice6afd993d5991bb3c50f676c637b9a5487261f7
2022-12-12 04:56:28 +00:00
Zoey Chen
45c646d6cb Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 am: 8b0070a509
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Iffed6efb8542259ae3f1ca22c198cc768a4ad126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 10:13:35 +00:00
Zoey Chen
8b0070a509 Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Ic4f9bb2f9fb07e9243dbb327f2ce0a41eeb9da0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 09:29:48 +00:00
Zoey Chen
a3c97876bb [Settings] Update the title if launch the fragment from search app
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
2022-12-07 07:18:42 +00:00
Ben Murdoch
f526772dcd Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554 am: 48dc0133ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I4edb11e2c2c71cc7ec4ff7b82ad18a3d6d5471d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 12:50:29 +00:00
Ben Murdoch
48dc0133ce Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I7647c859fe8196e0af0e5c2871918f0940a9fe0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 12:25:02 +00:00
Bonian Chen
590abcbbf2 Revert "[Settings] configuration for hidding SIM settings UI"
This reverts commit 6477275296.

Reason for revert: Build breakage

Log: https://android-build.googleplex.com/builds/branches/aosp-main-16k-throttled/grid?head=9340544&tail=9338589

Bug: 240515161
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: Ife727bc8b8bddafb58eed0d13d5d19fd1bf0a43e
2022-11-28 11:08:25 +00:00
Bonian Chen
011cdf6ef0 Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad am: f7090ebbee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109

Change-Id: I739f417c3d19b22bc102c9a1e0253692008bd370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 08:50:08 +00:00
Bonian Chen
f7090ebbee Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109

Change-Id: Iecaa9d4101864eaaeab0d5fc14277d39a9647682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 08:24:30 +00:00
Bonian Chen
6477275296 [Settings] configuration for hidding SIM settings UI
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I13ae0909d0120039cdfe8298a6892195de2fb122
2022-11-25 22:57:50 +00:00
Bonian Chen
b644c54256 [Settings][port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Merged-In: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Change-Id: I67166b0db08635ee2bc01a8208f96126b64fd0a7
2022-11-25 13:54:35 +00:00
TreeHugger Robot
1793a5a322 Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20519152

Change-Id: I979fff8af4a4da75a0fd0d173a6561032a78895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 00:30:00 +00:00
Bonian Chen
724dfbda22 Merge "[Settings] Add some log" am: 190b9ae3fa am: cd59cb983e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: Ieb35b981079c558937f73ec3779018a1deaa56b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 16:27:42 +00:00
Bonian Chen
cd59cb983e Merge "[Settings] Add some log" am: 190b9ae3fa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: I79999bda10e0be0df44fc73d8023e7f35d9f2730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 15:59:17 +00:00
Bonian Chen
c2776e0e67 [Settings] Add some log
Add log to support debugging.

Bug: 259611847
Test: auto test
Change-Id: Ic7ea410604794e3b9caa8ab955e1406578a25425
2022-11-23 12:36:17 +00:00
Bonian Chen
8f936c0bdb Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b am: d33fbde071
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Idc1ee6fcf8fc403ed9592adf34417ebe2b15b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:07 +00:00
Bonian Chen
4e1a1e65b9 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 am: e4fbf9d941
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I1bcbe2f57013ace3641937897ae2d0d8b64e2f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:05 +00:00
Bonian Chen
d33fbde071 Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:33 +00:00
Bonian Chen
e4fbf9d941 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I76eae77bcd825e7fa5fbc12b46eb72a7f9ddfd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:31 +00:00
Bonian Chen
a1c1bd0f81 Revert "[Settings] configuration for hidding SIM provider UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d
2022-11-22 11:59:26 +00:00
Bonian Chen
3b7d0d2e17 Revert "[Settings] configuration for hidding SIM remove UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
2022-11-22 11:59:15 +00:00
Bonian Chen
8e98f5a852 Revert "[Settings] configuration for hidding SIM settings UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I646d664b83d3db12cca81f53f7f5cd82a38e34d0
2022-11-22 11:59:02 +00:00
Bonian Chen
0a4295d688 Revert "[Settings] configuration for hidding SIM related UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0
2022-11-22 11:52:05 +00:00
Bonian Chen
135392ec6d Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 am: 0a733a9ed9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

Change-Id: I0ed0a83df84bdc76991778f8d37f69ee49872b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:43:39 +00:00
Bonian Chen
0a733a9ed9 Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

Change-Id: I4950a96f8637c06eadcf9f1248dc56b129dfca36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:19:15 +00:00
Bonian Chen
68a039754a Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467

Change-Id: I1b3e4fc3208e4476e81030319cec4b5705190c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:19:14 +00:00
Bonian Chen
f901e617c1 Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465

Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:19:09 +00:00
Bonian Chen
769d773997 Merge "[Settings] configuration for hidding SIM settings UI" 2022-11-22 08:51:53 +00:00