PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,253 Commits 1 Branch 0 Tags
c819cc5401922d94a673abfd4f9abf44f42ac49e
Commit Graph

108253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c819cc5401 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0e6b0ba8cb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234

Change-Id: Ib457298cf25a7886c125118fb87d9425c1f5f9c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:06:22 +00:00
Bill Yi
4948557b54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: 6654c69877 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234

Change-Id: I02eb36503083b73c3bc46e0b4957310efeff5607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:06:00 +00:00
TreeHugger Robot
1a59c69653 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 4fe83b61ff -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: Id9dc808dbcfdf9d75acf75ed7fd1257174bb437f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:03:11 +00:00
Bill Yi
a0ad43068a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2 -s ours am: 9d76bd7a1f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: I1ffc3ac599dc156766f0a0844c8cda078acdb9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:02:48 +00:00
Automerger Merge Worker
003f3914c4 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours" into tm-d1-dev-plus-aosp am: b13d27ffe5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: I9334c75634f8d0968ec4a43e80586352904ab4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:56:41 +00:00
Bill Yi
4b38cfde8c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours am: 7c0e477837 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: I1414d188012d50886c5df43afe3c04712748f7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:56:34 +00:00
Automerger Merge Worker
91b0cd2e93 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: 71eaa44916 -s ours" into tm-qpr-dev-plus-aosp 2022-07-23 02:55:23 +00:00
Bill Yi
d10cea9f3e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: 71eaa44916 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: Ied27e0dbe0bf24413e2ff4b98fdfc189282b13af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:55:06 +00:00
Bill Yi
1b4979f090 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: f97e8519cf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: Iaf0b902fdeefdce4a05d536107746ef5e4789afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:54:37 +00:00
TreeHugger Robot
0e6b0ba8cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234

Change-Id: Iaf373f97f40d7843265f975b6bf02e9e38bf3b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:37:27 +00:00
Bill Yi
6654c69877 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234

Change-Id: I11c1fb356da657a90a63fa99f33cc45d2621da02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:37:07 +00:00
TreeHugger Robot
4fe83b61ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: Icc4d112b712ae5ba0b1a150ff4bff1cb84b26ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:35:21 +00:00
Bill Yi
9d76bd7a1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: I8fe8a6b565eaa8500f2404d446ac3c9d230f0d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:34:57 +00:00
TreeHugger Robot
c79be68440 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234

Change-Id: I9adde2ee67544bbe9efc248a08a048eb8b65785a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:30:03 +00:00
Automerger Merge Worker
b13d27ffe5 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours" into tm-d1-dev-plus-aosp 2022-07-23 02:29:52 +00:00
Bill Yi
9dd5145c74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234

Change-Id: I96d8a1c29cb04a5dc84d871d9d58593f18233991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:29:42 +00:00
Bill Yi
7c0e477837 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: I0ba8bf2a232f5be9b3579dc51d14570b88c0e86c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:29:34 +00:00
Bill Yi
71eaa44916 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: Ida0da358fe3838e6190b2d8fa9b189fdb141e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:29:29 +00:00
Bill Yi
f97e8519cf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: Ic1c09df378ccae0e9bd3c8a5555205498010f272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:29:13 +00:00
TreeHugger Robot
1ea00326ca Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-23 02:03:07 +00:00
TreeHugger Robot
96bc6ca196 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-23 01:56:10 +00:00
Bill Yi
002496b1e1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: I1d9d706614d5157df413756a19ce0a45276aee33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 01:35:38 +00:00
Bill Yi
7a0b1e186d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: I10404af323f5abe0aaae3479eace278d23963828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 01:33:46 +00:00
TreeHugger Robot
b225e7ebac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d478bb07d2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392232

Change-Id: I28e1cf906ec69bab48aedaae139d3b17af607ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 22:59:16 +00:00
Bill Yi
21bb02eedb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d34c775b59 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392232

Change-Id: I0dcf82e38fc4afdf4f427596e6a7d17fd9585df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 22:58:56 +00:00
TreeHugger Robot
d478bb07d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-22 22:42:33 +00:00
Bill Yi
716c2083aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours am: d20855f6fb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034

Change-Id: Ib9bb29a4c7d794e6e7ac76c6f5fbc773226dd197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 21:57:27 +00:00
Bill Yi
bc8a2ee1bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours am: 45569adeed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034

Change-Id: Iae0af30f18592358d91b89a1dc5ad1a614eabc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 21:52:24 +00:00
Bill Yi
d20855f6fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034

Change-Id: I8a3edb5f1bfb14b2c87c0d39e703337ea2f97a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 21:31:51 +00:00
Bill Yi
45569adeed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034

Change-Id: I048a1c220b7c758c8eb1c7a43fbeb1f8be41833d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 21:31:16 +00:00
Bill Yi
011d462ac4 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530

Change-Id: I0f062cb7d34bab7dafe000abdd96d50e7acd1db4
 2022-07-22 16:58:27 +00:00
Bill Yi
1e9765bba2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib8c45dd3a435a2e409918b578428fdb7dd131243
 2022-07-21 23:17:43 -07:00
Bill Yi
babd7f1cc6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8836b6918c0c9a9527bb6a95a1abb9ab53a54e9c
 2022-07-21 23:10:10 -07:00
Bill Yi
04531538c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6afe4d66b49f6e961977912550f1f3f724f816f
 2022-07-21 23:02:36 -07:00
Bill Yi
d34c775b59 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1f37eb6e359d977359e2fd67f60ffe03ef28896
 2022-07-21 23:01:08 -07:00
Bill Yi
2d0fd7f558 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I893779ffabea7e7f41c1ecdf3e0f21c5f3183f2b
 2022-07-21 20:01:30 -07:00
Julia Reynolds
6292d9ff8c Merge "Improve App notification loading" into tm-qpr-dev am: 4ab5255893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19290333

Change-Id: Iac930f653c146436863978c1c98439d2e63a6837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 20:48:46 +00:00
Julia Reynolds
4ab5255893 Merge "Improve App notification loading" into tm-qpr-dev 2022-07-21 20:30:21 +00:00
Bill Yi
ba0a0c61fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 69dee8d4a8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: I220740fab54098c73118a4c3f5edbcd871593274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:54:53 +00:00
Bill Yi
b393114b83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 9f2d455437 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: I7779d4f4cdb32e775152de3da0a5479fc03ac389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:40:51 +00:00
Bill Yi
9f2d455437 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: If9b6741a081ae169312a2a340b65637951abc96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:33:30 +00:00
Bill Yi
69dee8d4a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: Icc93244f4cce2e97f1698939779b6e693e478f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:32:49 +00:00
Julia Reynolds
e90507373c Improve App notification loading 
1) Use UiBlocker, for better animations for apps with a lot of channels
2) Only load data in onResume, because the data loading step in some
of the controllers is expensive

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Test: load small channel and large (6000ish) channel app pages
Test: load individual channel pages
Test: load in-app channel shelf UI
Fixes: 215072888
Change-Id: I9a1c96f75b02f94b3ffc529d17d9c0cad7752de1
 2022-07-20 15:27:52 +00:00
Sorin Basca
fec750d98f [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours am: b9cd87f468 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Ic024b1ae2cd93580472f9da586881df044d8b5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:11:20 +00:00
Sorin Basca
d07b2242fa [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours am: 9cef5199a5 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Iefd343d353203140d856945fb504bbe9ca93d02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:11:06 +00:00
Sorin Basca
b9cd87f468 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Ia3ec9464567b759ab02b1231af36ae78da7799a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:47:13 +00:00
Sorin Basca
9cef5199a5 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Idb5adda6eb8b19760fb1a335ee4d3fd8cdde6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:47:07 +00:00
Sorin Basca
0085dcc80c [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I01c4d0a739da9f35f0c45561a04cc8273969bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:16 +00:00
Sorin Basca
b3fb29a4e3 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I8cdf0303f4a286ebc74bcb2af74aac2598075805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:05 +00:00
Sorin Basca
5781b7ab3a [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:36 +00:00