Bill Yi
415c6816c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Ifa2f8a4cd867263e57ec9ed7868424d2f0c0ebdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:58 +00:00
TreeHugger Robot
fc7894b9cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: I540deef195d21dabea0fb68519cf8842ab65ad18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:38 +00:00
Bill Yi
9fdc25a0f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: I3ba1d73cbe300ad5c62b9d081dc2bebaa56482cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:13 +00:00
TreeHugger Robot
fef0572018
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-31 16:52:26 +00:00
TreeHugger Robot
6bbc4c9532
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +00:00
TreeHugger Robot
2d464152ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +00:00
TreeHugger Robot
53b782e43b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-31 16:51:39 +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
Julia Reynolds
d8cfa9ad5f
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: Ia98d55bdd0625ff9ee7fea83915b1f81bf591159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 17:31:25 +00:00
Julia Reynolds
a171a9d426
Merge "Update string to be phone/tablet agnostic" into udc-dev
2023-05-30 16:48:52 +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
c4ed48cbe4
Merge "Try to avoid the timing UI issue" into udc-dev
2023-05-30 12:00:39 +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
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
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
b98d6644ed
Merge "[Settings] Remove redundant sort" into udc-dev
2023-05-30 04:05:22 +00:00
Chaohui Wang
1d7e22ee3a
Update activity name for ManageFullScreenIntent am: 94906cfe3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: Iff1262707d748b08ce5818b0e9d558026d877502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 02:37:28 +00:00
Chaohui Wang
94906cfe3d
Update activity name for ManageFullScreenIntent
...
Bug: 243421660
Change-Id: I3397d6d59895694185c0d9067da636623c08d3ac
Test: m Settings
Test: adb shell am start -n com.android.settings/.ManageFullScreenIntent
2023-05-29 17:11:08 +00:00
Bill Yi
241da8be39
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c387f01cd7090a26c171a311717564f1ce45dd2
2023-05-29 01:02:42 -07:00
Bill Yi
7f09268e95
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I168bc52fa4cf69d3deec0d29dbfe4b34308f3dfb
2023-05-29 00:57:24 -07:00
Bill Yi
2bcb8c25fd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib310d2df9ad9db0645aeea62d9ee37c758ebe03c
2023-05-29 00:55:43 -07:00
Bill Yi
317c0985d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe62fd0f3c35b0786f4e3b846174540802d8b2da
2023-05-29 00:53:30 -07:00
Bill Yi
e841794da4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I82e853e8a4336fd40b50451a83a435740719a87b
2023-05-29 00:52:42 -07: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
Julia Reynolds
3bf7130628
Update string to be phone/tablet agnostic
...
Test: View NotificationChannel UI
Fixes: 279155066
Change-Id: I6d02a863a27092e35e66023966b3e007c6b45d7b
2023-05-26 14:57:59 -04: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
Julia Reynolds
19c2f617aa
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I2fa505654e3e7efdec2457cedb7773df9894d737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 18:52:29 +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
Julia Reynolds
3ab478416d
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev
2023-05-26 16:46:50 +00:00
Treehugger Robot
5fa6d3b7dc
Merge "Restrict Printing Settings" into tm-qpr-dev
2023-05-26 16:28:03 +00:00
Julia Reynolds
bbef903b88
Revert "Update theme for ChannelPanelActivity"
...
This reverts commit 41eeb31b20
.
Reason for revert: b/284380876
Change-Id: Ia06bf047db187091753e560f70427abb5b26378a
2023-05-26 15:32:08 +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
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
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
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
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
Weng Su
f7d8f0481d
Fixed unable to enable hotspot with Security None
...
- Due to the design adjustment, the default value of SoftApConfiguration is not Security None, so the update of Security None cannot be omitted.
Bug: 283762826
Test: Manual test
atest -c WifiTetherSettingsTest
Change-Id: I07d18b8f73ab8190152332c01814a4bd72cf28d6
2023-05-26 12:26:31 +08:00
Tom Hsu
86db37ddcc
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Id715f0645548dc225cfcc1a3396e0e81bd06fbdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 02:46:16 +00:00
Tom Hsu
69caf6fbe4
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev
2023-05-26 02:08:13 +00:00
Yuxin Hu
f783947615
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:02:31 +00:00
Viesturs Zarins
8e9955a4f3
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev
2023-05-25 18:49:59 +00:00