Commit Graph

124030 Commits

Author SHA1 Message Date
Julia Reynolds
75e3741b27 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: f842b7754b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I280c3ba10991ec9b592800eb2378d0dd5c5ad68e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 18:17:30 +00:00
Julia Reynolds
1346017c04 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: d8cfa9ad5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: Ifae0ae3fdff889116862ac7bb658e4b39e5569c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 18:14:32 +00:00
Julia Reynolds
f842b7754b 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: I5d11d6500b35be8b59f9e298c701775638b60858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 17:31:26 +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
9e4d4858d8 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4 am: 07d8970208
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: Id7589cc252520d1b2b4d6e6f9e243878fe7e7f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 13:32:02 +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
733b751cea [automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78 am: 6c5b2f34cf -s ours
am skip reason: Merged-In Ie8653536117a999bd420ccfce961b17fe9349d35 with SHA-1 1f76872d78 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I4b049069355041d457a69d09614f52f2c4115c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:14:32 +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
476cd05e1d Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 597f143627
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0cde8c33b27a86354e26a03768535ab7d5119b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:31:56 +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
Chaohui Wang
d8f569dba5 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 1d7e22ee3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I3f83cfe633a88ac1362aaac4c8972b6d368eb3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:38:38 +00:00
Chaohui Wang
93d86268e8 Update activity name for ManageFullScreenIntent am: 94906cfe3d am: baf7e7e2a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I1a63eb36f333a3ffc0e663fbfc69414ff1d62402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 03:20:58 +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
baf7e7e2a7 Update activity name for ManageFullScreenIntent am: 94906cfe3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iab8361606bdb337c987498784f648da4b80e7a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 02:33:09 +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
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