Bill Yi
|
56cb3df78d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I70725f091a2da02f8303c8fa1e3af0da89156959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 22:11:52 +00:00 |
|
Treehugger Robot
|
79c090dd85
|
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I1af2ab2bf8673b338b10542099519c98ac6cc777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 21:50:06 +00:00 |
|
Bill Yi
|
2658b9338f
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Ie2e88d5a7767dcfbb631795bab3bd667cf6df57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 21:49:59 +00:00 |
|
Treehugger Robot
|
d25d75be91
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Icb1b76e223533802998bd976b5e45f0f67801d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 21:49:24 +00:00 |
|
Bill Yi
|
afc79889f6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I1c66afa2a7b26c9030123e6787947c569ea91bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 21:49:21 +00:00 |
|
Treehugger Robot
|
954afa9586
|
Merge changes from topic "tc_change_23050307_28" into udc-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
Import translations. DO NOT MERGE ANYWHERE
|
2023-05-03 21:31:16 +00:00 |
|
TreeHugger Robot
|
6759c1f3bc
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-05-03 21:29:38 +00:00 |
|
TreeHugger Robot
|
5b29767921
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-05-03 21:29:38 +00:00 |
|
TreeHugger Robot
|
b4d72181f8
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-05-03 21:29:38 +00:00 |
|
Treehugger Robot
|
f4ca8c6033
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-05-03 21:27:41 +00:00 |
|
Treehugger Robot
|
f9e3b286f3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Iebcec0e41e7766276b907b4ece881e319c049c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 21:06:49 +00:00 |
|
Bill Yi
|
77e56766c3
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: I583569809810380cb5a34088d216e84f001b41ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 21:06:37 +00:00 |
|
Treehugger Robot
|
30fe673ac9
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-05-03 20:55:59 +00:00 |
|
TreeHugger Robot
|
61f1af73e6
|
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Ic8d79dfaa411f3293f1a2905d834f731a69711ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 20:51:39 +00:00 |
|
Bill Yi
|
44d28ab6f5
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I3f702284b57f224f55eb10f49cbabdd030f92aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 20:51:24 +00:00 |
|
TreeHugger Robot
|
0848931c62
|
Merge changes from topic "tc_change_23050307_27" into udc-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
Import translations. DO NOT MERGE ANYWHERE
|
2023-05-03 20:46:29 +00:00 |
|
Treehugger Robot
|
c3d6820ffd
|
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 19:36:46 +00:00 |
|
Treehugger Robot
|
7244f3a0ae
|
Merge "Update auto_rotate_summary string for different product" into udc-dev
|
2023-05-03 19:09:07 +00:00 |
|
David Gutierrez
|
6a8a9492d7
|
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: I71a855eb9c082e8c32d6a56c07722c08984b019e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 16:37:22 +00:00 |
|
Becca Hughes
|
454cfbf2cc
|
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: I2a423b8a0a96ebcc51f04f0603e73e4f2fd24bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 16:36:56 +00:00 |
|
David Gutierrez
|
570943637c
|
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev
|
2023-05-03 16:17:31 +00:00 |
|
Becca Hughes
|
21733fa106
|
Merge "Align settings with new mocks" into udc-dev
|
2023-05-03 16:14:12 +00:00 |
|
Priyanka Advani
|
77f76267d2
|
Revert "Disable Settings large-screen optimization"
Revert submission 22926596-disable_large_screen_opt
Reason for revert: b/280606740
Reverted changes: /q/submissionid:22926596-disable_large_screen_opt
Change-Id: Ib918705206dc6b8bcbce21f83494d1108c6b8393
|
2023-05-03 16:05:25 +00:00 |
|
Bill Yi
|
aa9489179b
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Id55759bbc4a708d789a8b83421a3d82ea24b8d32
|
2023-05-03 14:36:07 +00:00 |
|
Bill Yi
|
7951afa544
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Ic53f6ad80da0a5e3f66bebd86e970ee2cce04f14
|
2023-05-03 14:36:02 +00:00 |
|
Treehugger Robot
|
67215bb0db
|
Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596
Change-Id: I1e231a4a909a1fa48034107e62a62f4ef75421ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 11:21:47 +00:00 |
|
Treehugger Robot
|
8060347ec6
|
Merge "Reducing slice requesting logging" into udc-dev
|
2023-05-03 10:37:24 +00:00 |
|
Edgar Wang
|
2c1ad2142f
|
Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436
Change-Id: Ibd7bcc5f3bc4c2abc79f30c8b4a93cd2503167d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 09:57:21 +00:00 |
|
Edgar Wang
|
089217a19c
|
Merge "Add new page enum for Account detail" into udc-dev
|
2023-05-03 09:49:11 +00:00 |
|
Edgar Wang
|
e416e27543
|
Update auto_rotate_summary string for different product
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
|
2023-05-03 17:44:42 +08:00 |
|
Vania Januar
|
3f449e0c49
|
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: Id38d54a83868152b6267b83b5292d9e251fb8381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 09:35:59 +00:00 |
|
Edgar Wang
|
fae664c79c
|
Reducing slice requesting logging
Bug: 253684322
Test: rebuild
Change-Id: If0e884875e09bd43b88f6b5f205ad450de488552
|
2023-05-03 17:04:38 +08:00 |
|
Vania Januar
|
e78b1f377e
|
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev
|
2023-05-03 09:00:56 +00:00 |
|
Chaohui Wang
|
a90bbde69f
|
Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558
Change-Id: Iaf2a725e7dea566fe1bff5dd805598587482b1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 07:30:56 +00:00 |
|
Chaohui Wang
|
d66335ae1c
|
Merge "Use correct App info screen's trash can icon" into udc-dev
|
2023-05-03 07:01:57 +00:00 |
|
Wenhui Yang
|
4e4941480f
|
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I0a7131567f578e045d20bc92fa50b1e4fb3f85cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 06:28:24 +00:00 |
|
Wenhui Yang
|
25de3b2b9c
|
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev
|
2023-05-03 06:11:23 +00:00 |
|
Charles Chen
|
2258dd83cd
|
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-03 05:48:14 +00:00 |
|
Charles Chen
|
cb5a240361
|
Merge "Disable Settings large-screen optimization" into udc-dev
|
2023-05-03 05:44:08 +00:00 |
|
Edgar Wang
|
b663f17d31
|
Add new page enum for Account detail
Bug: 260054568
Test: rebuild
Change-Id: I332bebf4f4ce725759860f937f50c8a6f21d8648
|
2023-05-03 13:06:28 +08:00 |
|
Chaohui Wang
|
2aca9d40f8
|
Use correct App info screen's trash can icon
Fix: 280120259
Test: Visual
Change-Id: I954c344c3f5fdd256de7519f1534c982c084a521
|
2023-05-03 11:59:43 +08:00 |
|
Becca Hughes
|
b21df6c5fc
|
Align settings with new mocks
Test: ondevice
Bug: 278919696
Change-Id: I274126bce3616596c4a81dd3385f0844d8bdbf71
|
2023-05-02 23:50:22 +00:00 |
|
Gil Cukierman
|
6b5aa480de
|
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I7a4655c5ac9ef9e7d66486591e1cfe566f385a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-02 23:50:13 +00:00 |
|
Gil Cukierman
|
6a2f6960ab
|
Merge "Enable null cipher toggle by default" into udc-dev
|
2023-05-02 23:11:40 +00:00 |
|
Diya Bera
|
eb63f480cc
|
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I97f9fe6b4e4fc3abaeff42490b32008c760cb29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-02 22:48:27 +00:00 |
|
Becca Hughes
|
02e4e1d05f
|
Fork autofill default app selection am: ddf359d0f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: Ibf684e0c968d8dfa39f3fa5a74929c0acf0bbd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-02 22:47:39 +00:00 |
|
Diya Bera
|
7dd5f5e156
|
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev
|
2023-05-02 22:34:09 +00:00 |
|
Becca Hughes
|
c5f2edcb4c
|
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I44dc0cd87c0be7df8b1506d203078ff57ff21138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-02 21:03:56 +00:00 |
|
Bill Yi
|
c206bd1217
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6837f08c5af272b81db9ece46d63b09dfb2e5757
|
2023-05-02 13:43:14 -07:00 |
|
Bill Yi
|
1e2f1374d0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I290a28733ab5a271def74e43c8c9f9e60c734589
|
2023-05-02 13:33:13 -07:00 |
|