SongFerng Wang
cb4888680c
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: If755aeb7884febe1c5a54aee654aaa114212e131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 08:43:29 +00: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
Matías Hernández
8238bfd731
Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev
2023-05-31 08:34:17 +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
Chaohui Wang
f0dc0933c3
Fix padding issue on Scan QR code screen
...
Fix: 284826809
Test: Manually when set Font and Display size to maximum
Change-Id: I3c67b5603d27cefdb4776a43d72264051f40246f
2023-05-31 06:41:34 +00:00
Chaohui Wang
4a4e89da97
Update comment for Settings_srcs build target
...
Otherwise no op.
Bug: 284799832
Test: m Settings
Change-Id: Ie2f72cf5d13c8f58d89e24fcf2acabd4844fe11d
2023-05-31 14:02:01 +08:00
TreeHugger Robot
14a3bbbbea
Merge "Protect App pinning" into udc-qpr-dev am: 7127e7606d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467969
Change-Id: Id45f32a96ac63bcb6075daed2e23f8ad4ab5aba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 04:15:08 +00:00
TreeHugger Robot
7127e7606d
Merge "Protect App pinning" into udc-qpr-dev
2023-05-31 03:08:13 +00:00
Julia Reynolds
83e087523a
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
am: d8cfa9ad5f
am: be451ceb73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: Ib4e331e3d2ea6a93c4025b98b9d000eaccdcf61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 19:05:21 +00:00
Julia Reynolds
efb2cb11c6
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
am: f842b7754b
am: 75e3741b27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: I1fcf39f6243b78905f1fc62e165fcc285d81916a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 19:03:32 +00:00
Julia Reynolds
e915cb5296
Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
am: d8cfa9ad5f
am: 1346017c04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841
Change-Id: I2dd04e30cd7106060f3d013b6adc363c66467bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 19:02:46 +00:00
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
be451ceb73
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: I00308d27a004f68456d42439a9a8054719d6648a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 18:17:14 +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
Tetiana Meronyk
a0040c1402
Remove unused parameter from createDialog method in User Info edit dialog
...
Bug: 280568195
Test: atest EditUserInfoController
Change-Id: Ib31f7d61d1d3e624c1ae28fc38602fcf566af302
2023-05-30 16:41:47 +00:00
Matías Hernández
acf9402657
Fix RTL-flipped phone number in Conversations
...
Fixes: 278430175
Test: Manual
Change-Id: I8fa506ec75e62958375026f1414838ba73604fe6
2023-05-30 17:06:29 +02:00
SongFerng Wang
615b7011d9
Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
am: 3eb25a2df0
am: 82e5fabe5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967
Change-Id: If46962e70f7731c6ffcd3d7a09269871eaf52cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 14:16:10 +00:00
SongFerng Wang
8641b57dc4
Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
am: 07d8970208
am: 9e4d4858d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967
Change-Id: I1b56670b94492aa419ed2705af535721e563df84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:49:40 +00:00
SongFerng Wang
82b3a15c55
Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4
am: 3eb25a2df0
am: 77d7480e86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967
Change-Id: I63339741e7039424870ca1afb34f71e2e207351f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:49:24 +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
82e5fabe5e
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: I7842ef5aa9e9f4fd24ee23e6a5ae03eafb1988de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 13:31:35 +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
663f274168
[automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78
am: ec08c23c6e
am: 9b6d377e32
-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: Ia8de5624f71456b57feca224f1b34190e402fff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 12:00:07 +00:00
Zoey Chen
9197f2af19
[automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78
am: 6c5b2f34cf
-s ours am: 733b751cea
-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: Ib52c924f16d24e9d9d2da22a5596eedaf2465693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:55:02 +00:00
Zoey Chen
3398d9da9b
[Panlingual] Remove the large space when searching language am: 1f76872d78
am: ec08c23c6e
am: 12cd65cfb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455
Change-Id: Ieb25ffffdb0fc84dafecc0f99037cebdad220143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:54:48 +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
9b6d377e32
[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: Ied36c7f01013d864c3a7a0173dd9a6375ae63b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 11:14:04 +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
Chaohui Wang
614de9cad8
Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev am: 232ab65146
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467965
Change-Id: I047939c39a931a7be3d28bf394bf73adb00299ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 10:30:08 +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
Chaohui Wang
232ab65146
Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev
2023-05-30 09:29:58 +00:00
Edgar Wang
1341de6527
Protect App pinning
...
When user try to disable lock device when unpinning:
If set screen lock, we should confirm pattern/pin/password.
Fixes: 277578736
Test: manual verify
Change-Id: I7193944c4ba0113b14c16dcf0109b0d114227a68
2023-05-30 08:32:27 +00:00
Edgar Wang
2917c0c1c0
Revert "Revert "Update theme for ChannelPanelActivity""
...
This reverts commit bbef903b88
.
Reason for revert: This CL is fixing notification panel theme issue.
Change-Id: I6bcd8c8f1e8d2f2bd2f7896ebf45d36f67f570b9
2023-05-30 08:28:30 +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
Daniel Huang
3021c1d3bf
Merge "Display gesture education button in touchpad settings" into udc-qpr-dev am: 58aab66f51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23428477
Change-Id: I23f3608d3b46d43c6e431348c98131946375921f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 06:41:57 +00:00
Daniel Huang
58aab66f51
Merge "Display gesture education button in touchpad settings" into udc-qpr-dev
2023-05-30 06:23:59 +00:00
TreeHugger Robot
2dfd21e760
Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
am: 261a252a84
am: 106525cd10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451
Change-Id: Ib3949766d9f6f8ae1492cfee0e481f69190ae814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 06:17:41 +00:00
TreeHugger Robot
9d5b91d15a
Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
am: 597f143627
am: 476cd05e1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451
Change-Id: I203dce90afcde392c9ca8b6a7dfae189bfb6ab92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 06:12:34 +00:00
TreeHugger Robot
1f22a21b0a
Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
am: 261a252a84
am: 71e6d2e29e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451
Change-Id: I7149441acacf4a302eb639e81f9c7a6d0ab60570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 06:12:04 +00:00
Chaohui Wang
4aeb362668
Replace deprecated fields with ImsManager fields
...
Bug: 284913888
Test: m Settings
Change-Id: Iac56df24f571e1c8268b8b217ec1a05f67f7a2b2
2023-05-30 14:08:21 +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