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
Daniel Norman
cbea2f8d35
Shorten the Accessibility shortcut tutorial string for button settings.
...
This should hopefully lead to shorter translations in languages that use
more characters than English, and also helps already-short translations
fit on one line when using maximum font size.
Screenshots:
- EN, default font size: https://screenshot.googleplex.com/4aDxShGtQ5Bnz2E.png
- EN, largest font size: https://screenshot.googleplex.com/83ovdiUBAwXgmNw.png
Bug: 284035025
Change-Id: Ie08b3fe9b741acf7d90c8fa306a336ce1b6f4bd9
2023-05-26 12:47:30 -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
5c238c0f5b
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: I884689419cbd75a43c78917d918833766c954453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 19:13:04 +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
f483a19888
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: I26438fbf63e70f412ccdc6e6d94e5a2ade2c9697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 18:52:25 +00:00
Julia Reynolds
d94d3eb622
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: I6195ee972e89c2428d0c95692d152fb8342b0310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 18:52:06 +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
Tom Hsu
718688bc9b
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
am: a035dfae6c
am: 2541b5f8c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I3f1881cc68d05cd482f3a234a5a73662b77cba6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 16:33:05 +00:00
Tom Hsu
cef757f476
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 1b6b5ea7e7
am: ea6ee1b2e1
am: 70380963c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I3b205b1ff962b824445ccb6a2cc016319ba0d8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 16:32:42 +00:00
Tom Hsu
228e984a38
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
am: 9d3602a85f
am: 2cfb9801e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I60332910d5e211a0c5f1b3c2576f15f85d8b1110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 16:32:15 +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
2541b5f8c1
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
am: a035dfae6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I38017483d7f60a556e7de8116f9fb8e55c42d96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 15:07:34 +00:00
Tom Hsu
70380963c7
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 1b6b5ea7e7
am: ea6ee1b2e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I364f8a715deb1711df546d6e0ec3690408cfc847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:42:25 +00:00
Tom Hsu
2cfb9801e9
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
am: 9d3602a85f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: Ic3da3d66594414354f8d0af95495d7dad3134dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:42:03 +00:00
Tom Hsu
a035dfae6c
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: I9e25905caa56f3a1b6bd185dae8e4f3b8374708e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:19:53 +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
8a9a86ad60
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: ca3c3ae9d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I1cb85516f8c73ce24a6564e61fc428cbfdac7e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:17:59 +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
ca3c3ae9d1
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: I2a6f69fc3ee9d52a2bf46cfe14f9dcd5eef6252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 12:53:10 +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
169cd24414
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 105af133bc
am: 62a7d1f128
am: 112c04d1aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I5fb3ff1f9d42cad085e6efbe96c36768b3632d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 09:31:23 +00:00
Treehugger Robot
36045ca6ba
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
am: 3025827edc
am: 32cce10d7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: Ice212eba3688add26701c25a8de6af942e359187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 09:30:26 +00:00
Treehugger Robot
112c04d1aa
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 105af133bc
am: 62a7d1f128
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I274ac6518d5fc0ca80eecf53705a5f3ef6304526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 09:02:46 +00:00
Treehugger Robot
32cce10d7c
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
am: 3025827edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I54a05c371d8cbeadc1e898b0677873501657fa26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 09:02:29 +00:00
Treehugger Robot
2587270451
Merge "[Terms of Address] Add a constructor with Attr for xml"
2023-05-26 08:58:58 +00:00
Treehugger Robot
cd2ca17440
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
am: 3ac1f9ec66
am: 0e10867d87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I1d78a29b45f1911a5d326d24aae8f193c27daed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:43:04 +00:00
Chaohui Wang
2e871b3727
Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389
am: 6a6e3b848b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437
Change-Id: I2dd90fc550a0db58021061024eefae44a02de7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:42:38 +00:00
TreeHugger Robot
2ac8dbc21e
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
am: bf08be55a0
am: 436ddeec90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I074549c60580e7c63137097afdab92516c0fd721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:41:53 +00:00
Treehugger Robot
0e10867d87
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
am: 3ac1f9ec66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I62dca7749f85b75da0c8fa52622a638270560abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:41:30 +00:00
TreeHugger Robot
a8493eed35
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 3a5719aae0
am: 607547541a
am: 0d08080108
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I61a84b77cd0c169b328dd50075baeddd437e7a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:41:13 +00:00
TreeHugger Robot
1b30b0dd43
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
am: b02de2eb5c
am: 0c0333b091
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I4cc28acbdabed1bf198eafb5ccf4ad5b03c32f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:40:44 +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
Treehugger Robot
3ac1f9ec66
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: I37634274b6f8b5f7f90ced16c3ac1e97102083f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:16:13 +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