Bill Yi
5cd00caaf6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55e5d7a9c7
-s ours am: 0591345d4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324315
Change-Id: I6c81e0c57d96eda4604917ff429abdc0b6a578b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:38 +00:00
Bill Yi
dd1f280faf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3a355835db
-s ours am: 14a1ecbf35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: Ia1b16620f4bcf906264e823426498ebaf74b0033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:18 +00:00
Bill Yi
3d26d430ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea4029233f
-s ours am: ee1f78854e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: I8b83eedd7c8a27e34890e4547f7bcc6ff1cc656d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:59:47 +00:00
TreeHugger Robot
8248c8506f
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
am: 7f278b5527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: I15550a1d82e80e11c313711851951c94329c25aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:56:42 +00:00
Jan Tomljanovic
1dfad1416d
Merge "Change page title of More security & privacy settings" into udc-dev am: d082c0aa4c
am: f2c811c455
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372069
Change-Id: I6e402f01554218a60ee3d4448748c6a169c90d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:53:34 +00:00
Yuri Ufimtsev
49863f246c
Merge "Change Biometric preferences summary when not enrolled" into udc-dev am: df9c660ed6
am: 61b8f70841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372068
Change-Id: I4573f9d25f9d61e1d8d6a43e038f4874ae526f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:50:23 +00:00
SongFerng Wang
6e7d0bda86
Merge "UI add more log" into udc-dev am: 378c2cf87b
am: b61e930c61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371396
Change-Id: I7a0434a1b71160b7b9dbe57d1769801caae8405a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:46:23 +00:00
Marcelo Arteiro
cf9332fd49
Merge "Automated Token Alignment Android/Material" into udc-dev am: 0102eb84ec
am: a8525d4212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21989405
Change-Id: Iae62ee4328d26922d1bedd2475c49aba2b45d0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 21:54:18 +00:00
Bill Yi
0591345d4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55e5d7a9c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324315
Change-Id: I0749e6087f708b446854ef7295ffee0568589aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:11 +00:00
Bill Yi
14a1ecbf35
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3a355835db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: I2f41f512cc8326ca16a7912c20e676790ad9b507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:10 +00:00
Bill Yi
ee1f78854e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea4029233f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: I31c86cd50bc0d62fb63b92cfab587a2ad8b17ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:26:42 +00:00
Bill Yi
dff27ef445
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-31 20:21:51 +00:00
Bill Yi
31190224ad
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-31 20:21:51 +00:00
Bill Yi
3917886974
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-31 20:21:51 +00:00
Bill Yi
3a355835db
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-31 19:51:51 +00:00
TreeHugger Robot
7f278b5527
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: I57df2e5887e41f1cb09bf78914f1289488540adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 18:52:45 +00:00
TreeHugger Robot
8ae1abecc1
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev
2023-03-31 18:48:29 +00:00
Jan Tomljanovic
f2c811c455
Merge "Change page title of More security & privacy settings" into udc-dev am: d082c0aa4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372069
Change-Id: I5f5cce5dacbc9fa7521b780c3cc79c22c9b3c9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 18:42:54 +00:00
Jan Tomljanovic
d082c0aa4c
Merge "Change page title of More security & privacy settings" into udc-dev
2023-03-31 16:25:47 +00:00
Yuri Ufimtsev
61b8f70841
Merge "Change Biometric preferences summary when not enrolled" into udc-dev am: df9c660ed6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372068
Change-Id: I151e16dfaf7b1e60969f9a0b8bcb6e25d1e8f3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 14:40:40 +00:00
SongFerng Wang
b61e930c61
Merge "UI add more log" into udc-dev am: 378c2cf87b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371396
Change-Id: I843e75f3dbe4c3f1a5a41907e02ca06a65c52f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 14:38:37 +00:00
Yuri Ufimtsev
df9c660ed6
Merge "Change Biometric preferences summary when not enrolled" into udc-dev
2023-03-31 14:36:55 +00:00
Yuri Ufimtsev
55b8e1818f
Change page title of More security & privacy settings
...
Test: manual
Bug: 275730450
Change-Id: I7d6a36aba08b8b61d0de0e2d34bcd828cf30abd4
2023-03-31 14:23:27 +00:00
SongFerng Wang
378c2cf87b
Merge "UI add more log" into udc-dev
2023-03-31 14:12:17 +00:00
Marcelo Arteiro
a8525d4212
Merge "Automated Token Alignment Android/Material" into udc-dev am: 0102eb84ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21989405
Change-Id: I86d938dadb3ac8e7ec4791b9f0738b5ef50d3b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 13:37:33 +00:00
Marcelo Arteiro
0102eb84ec
Merge "Automated Token Alignment Android/Material" into udc-dev
2023-03-31 13:18:38 +00:00
Automerger Merge Worker
6b71d50682
Merge "Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6
am: 7a98911ecc"
2023-03-31 12:42:15 +00:00
TreeHugger Robot
de193df3f7
Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6
am: 7a98911ecc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379143
Change-Id: I2a62acf48cb231b76da184009b9b45390cd8e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 12:42:08 +00:00
TreeHugger Robot
5e435b5a30
Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6
am: 8c4f3123b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379143
Change-Id: I92b2b31758601eb9a2cffac020ccc992469f0ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 12:42:02 +00:00
TreeHugger Robot
8c4f3123b9
Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379143
Change-Id: I39638488cc86fdfbebb87ec1c4e27f1584e42cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 12:17:44 +00:00
TreeHugger Robot
7a98911ecc
Merge "Improve dialog and system dialog UI" into udc-dev am: 34947069f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379143
Change-Id: I173933090a0e47ce2ada298a9b8bcc6377e83275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 12:16:35 +00:00
TreeHugger Robot
34947069f6
Merge "Improve dialog and system dialog UI" into udc-dev
2023-03-31 11:43:07 +00:00
Automerger Merge Worker
5bea2c5919
Merge "Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
am: 486691ad26
am: d951e2a048"
2023-03-31 11:01:14 +00:00
Treehugger Robot
cb30e648a7
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
am: 486691ad26
am: d951e2a048
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I3bf9d1a9e9a3da1938773139ea3f70316b61bde2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 11:01:06 +00:00
Treehugger Robot
6684c9b6fc
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
am: 486691ad26
am: e1bcb16bfb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I83ed2f2a8790d7245e81f365fe6aeebbde604522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 11:00:57 +00:00
Wilson Wu
da3275ca95
Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0
am: a19f80aab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474
Change-Id: Icce247b416591458f7d5ee459da4b9733c465df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 11:00:13 +00:00
Wilson Wu
7dc217f8f6
Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0
am: 4d91298836
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474
Change-Id: I6d5913765e265161918fc77b28b0da07ff128981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:59:57 +00:00
Marcelo Arteiro
c5631b45b2
Automated Token Alignment Android/Material
...
Resubmiting reverted CL Ia1f84669090e04b3a2aaac82bb5971032d74a125.
Reson: Bug was found in another CL (in this topic)
Test: Treehugger
Bug: 268682423
Change-Id: I0fead8915b2bb6281e29b32f7426c35b0138b10e
2023-03-31 10:53:24 +00:00
Treehugger Robot
e1bcb16bfb
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
am: 486691ad26
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I41d7ba84256d84af19fd1411645e6eb624648d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:49:11 +00:00
Treehugger Robot
d951e2a048
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
am: 486691ad26
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I083eb0ad520c24c4bcf7627db7881d1872cdac5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:48:53 +00:00
Yuri Ufimtsev
f0a01200c8
Change Biometric preferences summary when not enrolled
...
Test: manual
Bug: 256781166
Change-Id: I1e1bbafcf7edb0c9265f61d57b13f0858bb7700e
2023-03-31 10:41:26 +00:00
Wilson Wu
4d91298836
Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474
Change-Id: I5e430f44894d567d42f4c1901cc0550873958cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:33:24 +00:00
Wilson Wu
a19f80aab8
Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474
Change-Id: Ib735a7e0015c217ff1c9067c5bab3cdd1fe8cb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:33:22 +00:00
tom hsu
7a9202587e
Improve dialog and system dialog UI
...
- Fix wrong subtitle on system language list.
- Do not dismiss dialog if user touch outside of dialog.
Bug: b/276417170
Test: Manual test.
Change-Id: Ib049dc3d89e6afc7d39171ac686616cc64dae3ba
2023-03-31 18:18:16 +08:00
Treehugger Robot
486691ad26
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
am: 06bca85c6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I94301fd7e273f781aa5029128d960f8b9fb1c2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 10:03:11 +00:00
Wilson Wu
ce7ad1f8a0
Merge "Fix wrong user in personal profile" into udc-dev
2023-03-31 09:56:56 +00:00
Treehugger Robot
06bca85c6a
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
am: 7871a9e9bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 09:34:23 +00:00
SongFerngWang
62cc96ac05
UI add more log
...
Bug: 260535339
Bug: 275754566
Test: build pass
Change-Id: I15c26d5b13f93e5a425c16174d6fbc2780c4e0a6
2023-03-31 17:33:12 +08:00
Treehugger Robot
7871a9e9bd
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935
Change-Id: I998baee786f01ee74743a02d369f8159caa89ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 09:06:29 +00:00
Treehugger Robot
60d9be5a0a
Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio""
2023-03-31 08:20:36 +00:00