Bill Yi
2379404b47
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Iea2e6091924d2422ec9a9144142041799c47a12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 19:21:12 +00:00
Bill Yi
25207a98ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I6a621fb6a3a000bcf34229f6abc7808bee61fc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 19:20:51 +00:00
Bill Yi
506a9b317d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I7357483d255938670c6ff10ebd22f72f76e6bf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 19:18:32 +00:00
Bill Yi
7555bb81d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I39e92ab880ff65c6c2893df671cbc48fcec92028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 19:18:24 +00:00
Bill Yi
3c525dc4e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ib4af7b662cd2a8e5087376cbbd619efaf951ca75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 19:18:08 +00:00
Bill Yi
bdd7345e26
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I55532e33ae7ecf812d8cc54acbe9dbd3d94f40d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 19:17:41 +00:00
Bill Yi
c7918b9ac3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I0c078e0ceafb27e2c05505aa140a34909dea7f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:46:13 +00:00
Bill Yi
2309f00455
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I0b507ab323bccf47d2b145c5842a18809e312215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:46:03 +00:00
Bill Yi
2a19621591
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I7c878063b45fbbc1003be421c27c6b809db10051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:45:48 +00:00
Bill Yi
107129903a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ica28fa658d4b2992a86850c9d126585cd18c9f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 18:45:21 +00:00
Bill Yi
a3af1db910
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-02 18:22:50 +00:00
Bill Yi
f884a037be
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-02 18:22:50 +00:00
Angela Wang
25776de690
Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213 am: 3e304f9e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070
Change-Id: Ie16d8f856509b5290ef6254074ded0126f947bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 07:01:28 +00:00
Angela Wang
3e304f9e1f
Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070
Change-Id: I4ffcbfb99d718f96be27e93bcf6eb49ea4ebe7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 06:31:19 +00:00
Angela Wang
c725f550c0
Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070
Change-Id: Ic26e8a1c56b28b6c87b6678c558fe3179452982d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-02 06:31:08 +00:00
Angela Wang
4fb7c76213
Merge "Improves Settings search result of Flash Notifications" into udc-dev
2023-04-02 05:59:32 +00:00
Bonian Chen
64ff4fa85d
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours am: 432886441f -s ours am: fa3e0fcded -s ours
...
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: Ied5ef2ad1263a6308d1f00eb52bc33e4ceb9e69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 09:03:41 +00:00
Bonian Chen
fa3e0fcded
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours am: 432886441f -s ours
...
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I909590559f738ababa21d3d9fb9783c402fa46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 08:36:54 +00:00
Bonian Chen
11606c8bc1
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours am: 432886441f -s ours
...
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: Id717ef054d57424bddb85d3c7e0d02e647f34c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 08:36:42 +00:00
Bonian Chen
432886441f
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours
...
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I9668251485a221e6ae646dd403db27ed45d7740e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 08:02:26 +00:00
Bonian Chen
e8b96d4b25
[Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I2f29593b98a41fe4ced1f72dd9523be341850c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 07:32:05 +00:00
Candice Lo
b8206c85c9
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884 am: c96e19f819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I66795c6f016a705acdd20526b443e50f8f89cac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 02:57:51 +00:00
Bill Yi
a2f4c8bd49
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5e4ab0bbea59e5f05353776da8d5ae625767d93
2023-03-31 17:03:07 -07:00
Bill Yi
5847bd476f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9609f118fd4a653fd4a5a62fe786691d489e1d83
2023-03-31 16:56:15 -07:00
Candice Lo
c96e19f819
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I76dfd28a5bbed12adde56a94564ebfb440ff804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:42:34 +00:00
Candice Lo
e0c519f15b
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I3891bbc45413262524bd20b34d2483db88d5327a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:41:35 +00:00
Bill Yi
c6ace6cf14
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e9faa25ab9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330454
Change-Id: I4f6dbe7d15238b74b8ad3051c3db2781814bc799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:34:18 +00:00
Bill Yi
c70855c780
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9769b4d95 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330454
Change-Id: I7cb623b45d6e4fd2add81aeab11c082240c8dce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:34:13 +00:00
Bill Yi
154312ea9e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: abec88bf3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330447
Change-Id: I0357ce1db4697cc4450c8ff77f8d57e03e1db215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:31:51 +00:00
Bill Yi
28436a5609
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d141a659ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330447
Change-Id: Ia78b08ab942b5978b35855dc38fbaa90f678c5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:29:24 +00:00
Bill Yi
9c34ce478f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9ccc6527a5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330445
Change-Id: I8a5e47ad583936b535570d06a57fd44e1a6aa500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:26:26 +00:00
Bill Yi
8a31056b4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c09addb7ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330445
Change-Id: I86e5150eb74a1b08f537e61a23cc613a4152a34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:24:09 +00:00
Candice Lo
470dbd6884
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev
2023-03-31 23:17:48 +00:00
Chris Antol
436a5dbe01
Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6 am: 4b37ad1a3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715
Change-Id: I03f6dba51f168cc0a19e48c8770aceb6ecaf6212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:09:47 +00:00
Bill Yi
4e707d0a0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cadf15af82 -s ours am: 85d005509a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324317
Change-Id: I7900f3b25bc69b49d91a8e24ff2e88d9c870644b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:01:05 +00:00
Bill Yi
c78aa15829
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31c51eb0d6 -s ours am: 193005bd26 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324317
Change-Id: Ie880afcf178dfb3015c23e1adf847fdbd8a42bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:59 +00:00
Bill Yi
54015dec0c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 126b81097a -s ours am: 2943bc5df8 -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: Iea82b0f6835290ecf0d1ba2c5948c5bae5d664ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:50 +00:00
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
Bill Yi
e9faa25ab9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-31 22:19:18 +00:00
Bill Yi
abec88bf3d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-31 22:19:18 +00:00
Bill Yi
9ccc6527a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-31 22:19:18 +00:00
Darrell Shi
a86614db74
Hide timeout to user0 pref when switching blocked.
...
Do not show the "timeout to admin user" settings preference when user
switching is blocked on the current user, e.g. in demo mode.
Test: atest SettingsRoboTests:TimeoutToDockUserPreferenceControllerTest
Bug: 255277938
Change-Id: Ibd0944c69254000a453f477eb72a0ba5832e9793
2023-03-31 22:14:35 +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
Chris Antol
d067d026d8
Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715
Change-Id: Id0b4935323d5f961a2613207cf1bb92793da8b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 21:28:00 +00:00