Commit Graph

48667 Commits

Author SHA1 Message Date
Pavel Grafov
fa0a6b46dc Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ibec147373fadf2c5a8a7550b541b75961fb41a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 16:46:35 +00:00
Pavel Grafov
4aef4043aa Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I9eaafcb4e1ce813e8775cbce0c6eda5137e922fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 15:57:28 +00:00
Pavel Grafov
8e13abebc0 Merge "Avoid double quiet mode requests" into udc-dev 2023-06-01 15:31:13 +00:00
TreeHugger Robot
60de9941fb Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: If6b861c8c84aafae60c2d74a86f5bf4c276462eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:43:22 +00:00
TreeHugger Robot
9f831a600b Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: Ia75886edc6211a05645e047bc627a95f923cd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:02:59 +00:00
TreeHugger Robot
28c9000bb7 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I8d186dbc0615dd277d6bd2ffd0272beac0280a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 04:57:15 +00:00
Pavel Grafov
8112fb3828 Avoid double quiet mode requests
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.

Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2 Fix TetherSettings crash issue
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
  - Avoid to setup ViewModel when UI is restricted

Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest

Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
2023-05-31 20:38:36 +08:00
SongFerng Wang
15935328bd Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 623fd259f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ide603aabe80f369d705903ffa29c14200d04404d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 08:39:29 +00:00
SongFerng Wang
2d2f90fa38 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: I569db5421a70731f2f0666e9ef187422cff712e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 07:57:05 +00:00
SongFerng Wang
623fd259f7 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: I5e3335db194374187c3d3ad575e0db04795e2f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 07:56:29 +00:00
SongFerng Wang
bbf55cafb9 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev 2023-05-31 07:24:36 +00:00
SongFerng Wang
77d7480e86 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4 am: 3eb25a2df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I35abd7338759986fe870252cd2f2b87debee5bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 13:27:11 +00:00
SongFerng Wang
3eb25a2df0 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I0c24c04fb3bb769026e3794c461dddb926308219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:43:14 +00:00
SongFerng Wang
07d8970208 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I5c9c9ef6d4d58542b7277ea67b16c222577967cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:38:53 +00:00
SongFerng Wang
c4ed48cbe4 Merge "Try to avoid the timing UI issue" into udc-dev 2023-05-30 12:00:39 +00:00
Zoey Chen
12cd65cfb1 [Panlingual] Remove the large space when searching language am: 1f76872d78 am: ec08c23c6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I1506e24f73a976c99062f77cc4d5cea6e7ae4d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:09:59 +00:00
Zoey Chen
ec08c23c6e [Panlingual] Remove the large space when searching language am: 1f76872d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I8baa97b805f451606e4f07d473e580bdd0b3fa9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:29:14 +00:00
Zoey Chen
6c5b2f34cf [Panlingual] Remove the large space when searching language am: 1f76872d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I319f8070f4cd02842f397789d6495a8f27e2ad5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:29:14 +00:00
SongFerngWang
0f3f6086e9 Try to avoid the timing UI issue
Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.

Move "stop network scan" to first at onStop.

Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
2023-05-30 15:18:28 +08:00
Zoey Chen
1f76872d78 [Panlingual] Remove the large space when searching language
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35
2023-05-30 05:44:13 +00:00
TreeHugger Robot
71e6d2e29e Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: Iaaed0f91044266c6fe5846422a95faa30bf57d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:27:12 +00:00
TreeHugger Robot
261a252a84 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0d50d150c413f1fa9e17948e844a1331e85c21c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:47:26 +00:00
TreeHugger Robot
597f143627 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0ae4060e85b81360d84e22d55aa113c65e08f114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:43:09 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
TreeHugger Robot
6e9b0d97da Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I150a607f7d37f89224ab2aa0aadad7d2242ecbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:40 +00:00
Treehugger Robot
9abd002f0c Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I0cd780aed67bbe0560f5057fc430fc144b9f1f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:32 +00:00
TreeHugger Robot
ba5bf3e18f Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: Iafaadf2f8338b5bc52de8323787ce1c6926ad92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 19:57:20 +00:00
TreeHugger Robot
1efd1f6d3c Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I3c68a806fa8849b68f0e853a181d3f2859e485a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 19:13:08 +00:00
TreeHugger Robot
1df5ad89ee Merge "Update bad calibration error message" into udc-dev 2023-05-26 18:59:46 +00:00
Treehugger Robot
424440670d Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I9d29601614b0f166afc898f99e3ee87df974abf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 18:52:36 +00:00
Treehugger Robot
f8b14c6049 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib173215d93105852a2d611eae76d0eafb7e34b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 18:48:13 +00:00
Treehugger Robot
24db1f3393 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 17:44:20 +00:00
Diya Bera
1069105558 Update bad calibration error message
Test: Manual - send bad calibration error in code and observe the
strings
Bug: 280786940

Change-Id: I999750b98fcfd83a6fd265bac0aa334342c9f536
2023-05-26 10:26:59 -07:00
Tom Hsu
9d3602a85f Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33 am: 15ea70cfa2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460

Change-Id: I01944856d0e480838db534448404fff09685c7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 14:17:36 +00:00
Tom Hsu
15ea70cfa2 Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460

Change-Id: I4c8aed17f14a9a73d82ca7ad33f50cb471f86503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 12:53:13 +00:00
Tom Hsu
1b6b5ea7e7 Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460

Change-Id: I345ffb00c6685c86d17edc4de13d47815925239f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 12:48:57 +00:00
Tom Hsu
b1b4e25f33 Merge "[Settings] Add data roaming observer" into udc-dev 2023-05-26 11:56:20 +00:00
tom hsu
f2bf350303 [Settings] Remove redundant sort
- Use sql command to sort subscription info data instead of current.

Bug: 284306899
Test: Manual test
Change-Id: Ie0c5f5614a336771f865f02e7675b4e125ff15bb
2023-05-26 10:14:49 +00:00
tom hsu
499a2fa16d [Settings] Add data roaming observer
- Data roaming can be controlled by SettingsProvider, it shall be
   listen the change and set the change state to repository.

Bug: 278822324
Test: Manual test passed.
Test: atest passed
Change-Id: I6eb5330ba643c485c5d12eb879af1e0e8f7baed7
2023-05-26 16:13:09 +08:00
Treehugger Robot
3025827edc Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905 am: 624922703b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441

Change-Id: Iba9bf88e4c79d2dfb8ab8dcf0cd49372bb7f51cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 08:12:12 +00:00
Treehugger Robot
624922703b Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441

Change-Id: I910a6b2976d8a5beeb5c2131a667446090ccc445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:31:06 +00:00
Treehugger Robot
105af133bc Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441

Change-Id: I0cad3e779c3087b0ff0a0466b2e6ca259e2e9d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:26:47 +00:00
TreeHugger Robot
b02de2eb5c Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: 89b497a051
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I11844659c7c294c3bcbb99df425c02db747a6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:05:26 +00:00
Treehugger Robot
d3b41aa905 Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev 2023-05-26 06:53:16 +00:00
TreeHugger Robot
89b497a051 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I46d36e32cdb36b47eaa3c62005e65666c9fe94bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:26:29 +00:00
TreeHugger Robot
3a5719aae0 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I9cd1fcc11e76da716b44faf5994b61eda78f0a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:22:10 +00:00
TreeHugger Robot
52d2daf3b3 Merge "Fixed unable to enable hotspot with Security None" into udc-dev 2023-05-26 05:43:02 +00:00
tom hsu
d75bd52982 [Settings] After APM on, do not show the page result in Settings search
Bug: 249520846
Test: Manual test
Change-Id: I51df50f244649a406449449a0b2d39164ad5e218
2023-05-26 13:42:39 +08:00
SongFerngWang
e99db73c17 Modify the MetricsCategory as VPN_APP_MANAGEMENT
Bug: 260055313
Test: build pass
Change-Id: I7bb7d7519260abfa398b328829b559747d6f846b
2023-05-26 12:50:14 +08:00