TreeHugger Robot
706ca35aa8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I692572d6588be7cdf8c91cd7210487f011b60bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:35 +00:00
Bill Yi
f9494d6c97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Ifcaca129cc3e85e3b392e136b4b0bce191d8d55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:22 +00:00
Bill Yi
b28b4c141b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I8d65e9d41d57ce5a80e617f3fad1a8f0e46f8507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:01:15 +00:00
Bill Yi
c6445438aa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: Ia67488e5fccca13601c4dfafdd99d3c90c4140f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:01:00 +00:00
Bill Yi
ce611beecd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Idd9d2bd4d19477a608a818b8cd9e8fdb7f399831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:00:42 +00:00
Bill Yi
06ae56ce9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: I73b7e54a94f037ca351413257b88eabeec506f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:00:33 +00:00
Bill Yi
b76ebc730e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: Iec2ab26807b75912f0e78599b41aa5b4b73a71cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:00:14 +00:00
Bill Yi
59fa253f8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I1e0bca83173ef8964c9941cc96918ede3a77b1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:59:59 +00:00
Bill Yi
6b1fcc6bd5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: I527f49613e557b6a664f75ddf5886ad1df33745e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:59:44 +00:00
Bill Yi
be7ddbcb78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Ia3eb84c3efa8f4539d98987431e0c306d142021d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:59:27 +00:00
TreeHugger Robot
ee896b46e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: Icc79c0d0332a7e49d293cd5d7d1f34576ee3cd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:51:21 +00:00
Bill Yi
6a5ff2d6a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I334022cc242a2dfa826e048ddf4b154f4a537a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:51:17 +00:00
TreeHugger Robot
1175da33ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I560d16ec38f46389b7a65e836fafd2b03011243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:51:05 +00:00
Bill Yi
5c0212eab6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I901dc6475b628c6da28b36dbedece5bccc440b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:50:53 +00:00
TreeHugger Robot
999a23bee0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I72c0d984507caddaea744779fd36cdeec11d92ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:49:58 +00:00
Bill Yi
16761c0f92
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: Ie47db7c1f3332d27502c71ea88633a7a21be250c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:49:54 +00:00
TreeHugger Robot
3b34105f01
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I00a778116f323c1132677cd846c99f447905e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:49:45 +00:00
Bill Yi
b807236c50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: If8b6084476147b2d25f7174d8520cf1cf058b662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:49:31 +00:00
Menghan Li
94f328040d
Merge "Remove obsoleted code: VideoPlayer"
2022-06-10 06:31:05 +00:00
Menghan Li
2312cf96be
Merge "Remove obsoleted code: VolumeShortcutToggleFragmentForSetupWizard"
2022-06-10 06:30:26 +00:00
Bill Yi
21559f3793
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-10 06:17:14 +00:00
Bill Yi
a5648098e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-10 06:17:14 +00:00
TreeHugger Robot
2b662c5a07
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
TreeHugger Robot
71826af4fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
Automerger Merge Worker
6508c492cb
Merge "Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82" into tm-d1-dev-plus-aosp am: 64e9a40d9c
am: 18460e4a13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ibcf38bf0293916f80fd77c89bdee8ccf4e7d2f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:33:21 +00:00
Jason Chiu
bd15e7f64a
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 6780e6ffdd
am: f26f49a789
am: 7a929f8c29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I81feb5339e0ee419a8652e75568610e55b4f9ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:33:14 +00:00
Jason Chiu
c2ba8566ad
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
am: 80f4582723
am: ed07da032a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Iafe5b31154ded0b325e3a07efa121adffa94211c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:33:06 +00:00
Automerger Merge Worker
18460e4a13
Merge "Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82" into tm-d1-dev-plus-aosp am: 64e9a40d9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ica6f182fd3140b387066c737bdc9587a9c791036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:06:27 +00:00
Jason Chiu
7a929f8c29
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 6780e6ffdd
am: f26f49a789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I57c831f2512ef26ab2d217bbc24ac642732cc9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:06:12 +00:00
Jason Chiu
ed07da032a
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
am: 80f4582723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I64e5ba41e0bb3deec4607b6642e0f640a8e29f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:05:58 +00:00
Automerger Merge Worker
64e9a40d9c
Merge "Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82" into tm-d1-dev-plus-aosp
2022-06-10 02:51:16 +00:00
Jason Chiu
f26f49a789
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 6780e6ffdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ie8d2fc2fd39a72e6057d1cab6919dbd8c93a91e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:13 +00:00
Jason Chiu
9c7cf01266
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I798dca9946185ab979f31c633f0240ccc722a4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:13 +00:00
Jason Chiu
80f4582723
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I46c865b8c61b359254ea8e971c26b0faf09a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:11 +00:00
Jason Chiu
4ec1953a82
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Idf47ad68dd184cf45ce467eeb6be12a30e8c3057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:34:59 +00:00
Jason Chiu
6780e6ffdd
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Ied9c640a9a3586efa78eb1456234cbfac44904fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:33:22 +00:00
Bill Yi
c1ebda67c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
2022-06-09 09:45:40 -07:00
Joshua Mccloskey
477ee6e456
Merge "Clear FP error only on progress." into tm-qpr-dev am: 6947d508e8
am: 71ca81a039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18721503
Change-Id: I8b0564ac9669a4c52c67c332378473c0c26511c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 16:32:42 +00:00
Joshua Mccloskey
1c19c2e8bf
Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3
am: 0295bc2285
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040
Change-Id: Idc4ab9e97b8e8cf978a8139e67976cd015091684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 16:28:56 +00:00
Joshua Mccloskey
71ca81a039
Merge "Clear FP error only on progress." into tm-qpr-dev am: 6947d508e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18721503
Change-Id: Ie7ca8f13d8f644ea03ff90a5c5a05f41f4536a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 16:09:38 +00:00
Joshua Mccloskey
0295bc2285
Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040
Change-Id: I0188ab24c487cc569645d1b07dbb25c94024df4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 16:09:27 +00:00
Joshua Mccloskey
6947d508e8
Merge "Clear FP error only on progress." into tm-qpr-dev
2022-06-09 15:58:45 +00:00
Joshua Mccloskey
81224f09e3
Merge "Add functionality to restart fp enrollment." into tm-qpr-dev
2022-06-09 15:37:53 +00:00
Bill Yi
307f491327
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1c5638e6e3c3eef94aad83f3799058fe9043e77b
2022-06-09 07:35:45 -07:00
Bill Yi
d142ec9f58
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I45c392de92cbb27ed670cb70b657074d0ac762e1
2022-06-09 07:31:39 -07:00
menghanli
4cc19665ac
Remove obsoleted code: VolumeShortcutToggleFragmentForSetupWizard
...
The ag/10232215 checks the APK target SDK to use corresponding fragment to avoid wrong status before these app release to R. The patch can dynamic change Select-To-Speak and Talkback on SUW Welcome Screen. Now, the preload select-To-Speak and Talkback uese SDK T. We can remove the obsoleted code.
Bug: 235458916
Test: make RunSettingsRoboTest
Change-Id: I1e7b9c12bf73a5edcaef8814f55df98b9baf9f5e
2022-06-09 20:21:04 +08:00
menghanli
77d5e1ec25
Remove obsoleted code: VideoPlayer
...
Use the LottieFiles to show illustrations for settings. The VideoPlayer is not used now.
Bug: 235454775
Test: make RunSettingsRoboTest
Change-Id: I008d399632763f60c1a4028cb50ef90d7687bd88
2022-06-09 12:09:17 +00:00
Piotr Wilczyński
7c9eb92300
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
am: 8bfab753c1
am: ccb82954c4
am: f73f814ce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: Iadd3f84681a26e6e06dc5894b23c663c8b474410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 10:53:18 +00:00
Piotr Wilczyński
a0eb3b2124
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
am: 395861f79d
am: 7018bd6f69
am: 74f809f766
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: Ib8c11b9e11c93da53ea1b355187232e9ad546b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 10:53:01 +00:00