Bill Yi
3f97401447
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a3f1cb5958809c0b34692b456170a921df0a7dc
2023-05-29 00:54:17 -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
Bill Yi
cd3e51654c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I50112e91300526751158c02ab03960f005b60c39
2023-05-29 00:51:07 -07:00
Bill Yi
e9d26cfdce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I481b414f50fc988072ec462c2e6ac4f48fe69585
2023-05-29 00:49:34 -07:00
Automerger Merge Worker
18af57da3e
Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2" into udc-dev-plus-aosp am: c2b075b387
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I035428529ea1c0815d15614f97f28ab956f8a8a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:23:59 +00:00
TreeHugger Robot
081b525ba5
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: ba5bf3e18f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I03e4f57164e78e90edc8e578d383654438ba5a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:22:48 +00:00
Treehugger Robot
a451e2cb2a
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f8b14c6049
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I472a9b27cc33bd5adb55cc115502c3c54195feb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:22:02 +00:00
Julia Reynolds
a4d98455c9
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 08145209c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I0f879939b4a94eb7d5ac387826801cc9188203aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:41 +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
Julia Reynolds
d9cc409fca
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Ic06bc743e3903e60b8e1bcdb67ed655518df4fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:23 +00:00
Automerger Merge Worker
c2b075b387
Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2" into udc-dev-plus-aosp
2023-05-26 19:57:28 +00:00
Treehugger Robot
c93a4e7875
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: If0f46143aa0c2b4ad9ede55a21282f55b564a909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 19:57:22 +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
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
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
Julia Reynolds
08145209c6
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: I56363190316fb102e56e38e5096e008fb4a7984b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 18:47:23 +00:00
Treehugger Robot
2bb637fcc2
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: I2f9d6bba0bad509cbe0ca2b42dea01a697e2c80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 17:44:52 +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
ea6ee1b2e1
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 1b6b5ea7e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I63989542a5f8f0f39bc5aea7260a009f1e81c0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:19:53 +00: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
Treehugger Robot
62a7d1f128
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 105af133bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: If7c476fcb858911cf5278751a224dc412ea39fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:16:56 +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
607547541a
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 3a5719aae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I2685760376c98a438191ca4f5c051cfc24262f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:10:19 +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
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
a754427874
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: f0fa79dc18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Ic09ee4ea3bf4b9ab6dfde001bf0393b4c0ef16b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 03:30:18 +00:00
Tom Hsu
8cd034ae72
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 86db37ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Ic7d3565555f54a259a647f614370381c9563d3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 03:25:33 +00:00