Treehugger Robot
|
c85a655793
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 0145eec48c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I7d316f8fcdd22a387a8a2ed63ef5a9adbdea95b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:13:43 +00:00 |
|
Treehugger Robot
|
b73b014d14
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I2075b899c586a7b7975b24753a1483a474621dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:12:43 +00:00 |
|
Bill Yi
|
ac2dc0940e
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I136d80a61a606d20cb417bbafed6868bc1eb940a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:12:37 +00:00 |
|
Treehugger Robot
|
f9d8c74ccb
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I4a4afe4a04a3d40abde238320315fd304ff34919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:10:06 +00:00 |
|
Bill Yi
|
218406c700
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I41d460241b8cf05258d3476effce8daac7bb54e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:10:00 +00:00 |
|
Treehugger Robot
|
e370dbf53d
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: 568034bd25 am: 3bd166535c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I25ca3cfb17fb71264d38e9b84f5499c20d875c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:08:27 +00:00 |
|
Treehugger Robot
|
8e40694817
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 13e131f352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I49f8377cff2699da3a8bede458ba09e9af29c594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 18:08:02 +00:00 |
|
Becca Hughes
|
68470a4f27
|
Warn earlier about 5 provider limit
Test: ondevice
Bug: 281616441
Change-Id: I4c4d257e1a0a6396b3948a2b50462bbef1987729
|
2023-05-10 17:42:21 +00:00 |
|
Treehugger Robot
|
28f09b6c46
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I7fcf17ec832047aa0756583eae1f0a87b491e033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:40:24 +00:00 |
|
Bill Yi
|
7e9b0a8bc7
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: Ibebb73e3225272719df3ac79e959f5230aded989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:40:15 +00:00 |
|
Treehugger Robot
|
4fde620b4f
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: If7930aac56969335f549e208c56744aad22488cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:37:36 +00:00 |
|
Bill Yi
|
cd402bd739
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I8eb20cddf535b6e0bf431039862ed21e31ac851b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:37:29 +00:00 |
|
Treehugger Robot
|
90d6926883
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: Ibbdacb724f8f9742847524543eea9cacaf61e5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:36:10 +00:00 |
|
Bill Yi
|
3464a64172
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: Iee243cd4b9d5d8930d600886000e584a708b634a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:36:03 +00:00 |
|
Treehugger Robot
|
3bd166535c
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: 568034bd25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: Iad4f1fdcf6766e175da64835e7c703f697e3d9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:30:45 +00:00 |
|
Treehugger Robot
|
0145eec48c
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I1bb59a1afe40cee69dd58c04d2778253f1313b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:30:10 +00:00 |
|
Treehugger Robot
|
b8e02ef73f
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
Import translations. DO NOT MERGE ANYWHERE
|
2023-05-10 17:26:27 +00:00 |
|
Treehugger Robot
|
13e131f352
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I1eb27aa635111eea5a31db6ac9e59cfc51ce858a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:25:58 +00:00 |
|
Becca Hughes
|
7a5ec88784
|
Fix credman provider not showing
Test: ondevice
Bug: 281787107
Change-Id: I4cc4cc2216a7c452ee63cb742a292dadbd46714f
|
2023-05-10 17:24:22 +00:00 |
|
TreeHugger Robot
|
ab8489d69e
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ca64a03ef9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I1d29c135ed303c11fa76ccf6efa3173b48b195c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:10:38 +00:00 |
|
TreeHugger Robot
|
3b0732aa61
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 11a070b2ae am: dfda9f20d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: Ife016ed7b0ebdcea2dbf95738d3df8e40cb47a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:08:26 +00:00 |
|
TreeHugger Robot
|
672ef42ab8
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ed35b5e376
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: If0629a0a487c776f0e26b70e55ace1afdf3a34f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 17:07:43 +00:00 |
|
Becca Hughes
|
347c165521
|
Fix change not picking up work profile
Test: ondevice
Bug: 281787107
Change-Id: I676384877ce21ae1f1e6972646fc465828013c74
|
2023-05-10 17:02:02 +00:00 |
|
Treehugger Robot
|
d5d3d55bbd
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: If0f86befeac5448ec837a86654c875c2d38db595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:47:50 +00:00 |
|
Treehugger Robot
|
b7aa09caf8
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I21b56f4f1d638c287023c44aa3241804aa428eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:47:48 +00:00 |
|
Treehugger Robot
|
568034bd25
|
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I65fb0509184b16e43f784e3ad2584f322682982f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:43:38 +00:00 |
|
Bill Lin
|
4caa3ece94
|
[conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: e5dfcc0270 am: 547f6d63a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:29:52 +00:00 |
|
TreeHugger Robot
|
dfda9f20d7
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 11a070b2ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I6db7167d0e4e26fb0b6e2c170139f7071e24c78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:06:42 +00:00 |
|
TreeHugger Robot
|
ca64a03ef9
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I3733dea6d1b0a21fd38aeb7b85d5f303e1c39496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:06:16 +00:00 |
|
TreeHugger Robot
|
ed35b5e376
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I30b75d09f1827198e788b2afac096df87bf79306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 16:02:06 +00:00 |
|
Treehugger Robot
|
6a06cdd1bf
|
Merge "Fix mistake in test" into udc-dev
|
2023-05-10 15:59:23 +00:00 |
|
TreeHugger Robot
|
1e7990341c
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I3e9f8ee058f36819fad9675afd69f07d6524cbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 15:24:16 +00:00 |
|
TreeHugger Robot
|
2075dbd4c3
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I6165748f6dd4a8a81d539e6f26904eb6e495b0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 15:23:58 +00:00 |
|
TreeHugger Robot
|
11a070b2ae
|
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: Iefe0f6f46d38961d58a3548a9767fa2b106cbc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 15:19:40 +00:00 |
|
Jigar Thakkar
|
654df0d806
|
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 5577564ed0 am: 39552c5f86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: If50c4ed9b2804dba0603308f33f1932155f694cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:51:13 +00:00 |
|
Bill Yi
|
48f0db8ecb
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b6efea437a
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23126184
Change-Id: I221b746a07a1dafbb10a13608f0eb2b5384d5376
|
2023-05-10 14:50:27 +00:00 |
|
Jigar Thakkar
|
dd3e47e855
|
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 26ce822b48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: Ie507c40b4da87b397bcc0069079914a596beb90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:50:07 +00:00 |
|
Jigar Thakkar
|
33f1f4c479
|
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I465db655dd963b47551c57f7686f77adca6234d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:48:19 +00:00 |
|
Bill Yi
|
77e2066906
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I4c4b082a3e8f84daf65189578cd69bcf3dc452cc
|
2023-05-10 14:37:54 +00:00 |
|
Bill Yi
|
40fae6e492
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I21afad7371cf360d1020f485d5f133027cc6545b
|
2023-05-10 14:35:36 +00:00 |
|
TreeHugger Robot
|
c0c0edd078
|
Merge "Fix title of no-screen-lock notification" into udc-dev
|
2023-05-10 14:33:36 +00:00 |
|
Bill Yi
|
74737aa45e
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I47fbf6522118645f92ca7d0611282ae70079dac3
|
2023-05-10 14:31:59 +00:00 |
|
Bill Yi
|
f637cc7f49
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667
Change-Id: I24760694eb939797e648180e2578a74f008280e3
|
2023-05-10 14:31:15 +00:00 |
|
Jigar Thakkar
|
26ce822b48
|
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I5a6d228b3658e5387d47098ac118c6fc0fbc638e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:04:27 +00:00 |
|
Jigar Thakkar
|
39552c5f86
|
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 5577564ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: Iec7fc0521f11c06bec39628b55273805652fdeb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:04:08 +00:00 |
|
Himanshu Gupta
|
c75b8d6bd9
|
Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 am: 1e77d0d6c9 am: e8fee72eeb am: 56eb5c896d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242
Change-Id: I4f26776fd228238bfca70d85a4364b8ab2c0dae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:03:05 +00:00 |
|
Himanshu Gupta
|
99ecc49ade
|
Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 am: 81180f985e am: 0b19e92158 am: a4a9af2cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242
Change-Id: Idea4c0fc079bfba6f8837ab054593eeaba245ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:02:56 +00:00 |
|
Becca Hughes
|
f6ee556988
|
Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 01b75c9719 am: ce1c823116 am: 537b0d6ecc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934
Change-Id: If5bd367241b7229a5559f509ada5a51f348bbb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:02:47 +00:00 |
|
Becca Hughes
|
1e751dc32c
|
Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 847e29faf7 am: 8df9b69c10 am: e1e9ee90a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516
Change-Id: I048d8dfe5b7c31c59d5b17f8ea96855b5fca727d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:02:38 +00:00 |
|
Becca Hughes
|
0f88c15b00
|
Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 75d3f20983 am: cc9463004f am: 592f2fa78a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934
Change-Id: Iaca714f73270d0f282d77116b0878b2d22849beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 14:02:30 +00:00 |
|