PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,612 Commits 1 Branch 0 Tags
245def5cad2840485d0b49a1672ea672381b95cc
Commit Graph

111612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
140bcebdb2 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours am: accde42e7d -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I05d44ca0d4aae5afcbcf7b81172db4f65239f1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:15:51 +00:00
Yanting Yang
3e8931d5b0 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: 615f13120c -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: Ie91293bee1f3f096f5599b0c43fc5f8bd0c2551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:15:45 +00:00
Yanting Yang
9038a26635 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours am: f3d990e36d -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

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

Change-Id: I7cfb933ca1c82100996120520e228e765955d7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:59:56 +00:00
Yanting Yang
adc9a200ac [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Id63a2ff11919abe62c0dbcaa5fbe17f10212ce89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:59:49 +00:00
Yanting Yang
6326f5e65a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334 is already in history

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

Change-Id: I390e1a3a8d8c683c604724571459ba7ebeccaf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:56:12 +00:00
Yanting Yang
accde42e7d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I6dc5bcd9b40c5f565ec370ca99cea68a5d4ea528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:43:31 +00:00
Yanting Yang
615f13120c [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I98957aa0f4c8108d6cad7b3beb4bef5a47821a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:43:26 +00:00
Yanting Yang
abfd6640f7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours am: a262c1f821 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: I82653afb955c201451a6262c0afb2390d3cb29d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:40:49 +00:00
Yanting Yang
f3d990e36d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours am: 3594b1e412 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

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

Change-Id: I3a56150f056da9c1ecd77ea2e97d3196a0ca811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:24:05 +00:00
Yanting Yang
1b30190fe1 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9 is already in history

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

Change-Id: Id6ea47451afaeccfa879791583a880c1986acc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:59 +00:00
Yanting Yang
3594b1e412 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada is already in history

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

Change-Id: I1b23667c48d00bb5e33cd2d3f96ee6ba3d0ee438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:36 +00:00
Yanting Yang
3fefcb236a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: Ieac19e01cf73c5861992714c7602e4c88ea87c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:31 +00:00
Yanting Yang
f54f57f1a7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I3ee17f055872b9ad8929c3a07f70a12646040939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:10:14 +00:00
Yanting Yang
a262c1f821 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: Idb0ba09a9aab296d27698c29c04c976332331925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:10:08 +00:00
Yanting Yang
33186e2f03 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I45654cc46309d8051f06a0b6082d38a04e612196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:06:36 +00:00
Yanting Yang
5dbaf208f0 Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871702

Change-Id: Ic9875331fa1a63feee2d51c4782e8c98df882794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 02:34:52 +00:00
Yanting Yang
2ab25b8b96 Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871682

Change-Id: I884e3ce1ba968181da190fbf2ec1196f4894c4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 02:32:19 +00:00
Yanting Yang
f43feb6a46 Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev 2023-01-07 01:56:05 +00:00
Mady Mellor
dee935a9fc Add a tablet specific illustration for bubble settings screen 
Bug: 243902048
Test: manual - check that the illustration on tablet is shown
             - check that switching between dark and light theme
               updates the illustration
             - do above on phone
Change-Id: Idcc3660be287ed26a231813001de0517481ef514
 2023-01-06 16:35:36 -08:00
Becca Hughes
da53b2912c Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I0f6b895cf2ac1a2294eafdad6f15c825bb4ead5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:28:41 +00:00
Bill Yi
c768c92641 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: If86bfe3c232a6fab682b6dad9fb4dd2f0a7a9d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:27:07 +00:00
Bill Yi
d00c17ec81 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I8499b724c8500edf9129a1f612b97f756defd1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:26:04 +00:00
Becca Hughes
5b7dc67d64 Merge "Add credential manager team to OWNERS" am: ce5d029670 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: If599c23c05ab5eaf4a80a4b3a4acd0f3c6f78cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:05:01 +00:00
Becca Hughes
ce5d029670 Merge "Add credential manager team to OWNERS" 2023-01-06 20:03:13 +00:00
Bill Yi
8f67dfd0c6 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I3051eb6db0fcb1e3ac1e2300f18461a297f789b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:49 +00:00
Bill Yi
9be6f23a0c [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I07d24876a3be08444cb4660b280565679cb5ab04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:02 +00:00
Bill Yi
2e7924abcf Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Bill Yi
2d50872f81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2681d8cc05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic705dd2a80e2a322142e1e91afa80ef0f00c0383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 18:30:40 +00:00
Stefan Andonian
19b790376c Move ViewCapture On/Off controls to QuickSettings Tile. 
When users enable Winscope tracing, ViewCapture tracing will also be enabled. Winscope tracing is currently enabled via a quicksettings tile hidden in the developer options menu.

Bug: 224595733
Test: Verified that the new QuickSettings tile doesn't crash via normal interactions (pressing, long-pressing, etc.). Also verified that ViewCapture is turned on when the QuickSettings tile is in the enabled state and is turned off when it is in the disabled state.
Change-Id: Ie43d307806dece5748e22ed2af12ed3514c1148a
 2023-01-06 18:16:49 +00:00
Bill Yi
1883efae0a Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE 
Merged-In: I11c236f3901c9faaeb6c702678d330dde8f07f38
Merged-In: I3d784788884f9b80733786dc73d9bb62ffef817b

Change-Id: Iabf5075f225933cd03d2d2ac43b9821ecc9fb7c1
 2023-01-06 15:26:15 +00:00
Bill Yi
916adf4270 [automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 182c397d37 -s ours 
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b is already in history

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

Change-Id: I083e54e24f3894ef3d798bfafce6aa0b221091b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:33:21 +00:00
Bill Yi
5f3ffc5ec6 [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: c286104951 -s ours 
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b is already in history

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

Change-Id: Ia8ed6202af921e0e4e4e175da868c7a7ef03fa10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:32:54 +00:00
Bill Yi
182c397d37 Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2023-01-06 07:00:53 +00:00
Bill Yi
2681d8cc05 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
 2023-01-05 18:07:21 -08:00
TreeHugger Robot
c1ce13f040 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a0d84081e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d784788884f9b80733786dc73d9bb62ffef817b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:46 +00:00
Bill Yi
d53751548b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38268df283 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cb72e3462a02722d9f8403bd44d9e19917b5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:29 +00:00
TreeHugger Robot
5291d0476f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80404721aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia554a744e24581000e42e6db0c57a0510b86fbf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:16 +00:00
Bill Yi
53f80eb54a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6480a5ff9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I145c5cf356be12dcdec6bf677f7f8195cea9b3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:37:00 +00:00
Grace Cheng
305fbd98db Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930

Change-Id: Id161cb7489bc786288adf6fb578c0ed525264202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 20:32:17 +00:00
TreeHugger Robot
a0d84081e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-05 20:13:42 +00:00
TreeHugger Robot
80404721aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-05 20:13:42 +00:00
Grace Cheng
28d0e72a6d Merge "Updates sfps animations for natural orientation" into tm-qpr-dev 2023-01-05 19:57:19 +00:00
William Escande
1da99510b1 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: I3346dba2aa9751bc77c17287dfe5d31759c05607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 07:02:43 +00:00
William Escande
ce2edfa3d4 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: I11c236f3901c9faaeb6c702678d330dde8f07f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 06:31:44 +00:00
William Escande
9aa06f28e8 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" 2023-01-05 05:59:38 +00:00
Karen Lu
98e202f98f [automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: d6a9cba834 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ia7bc9e7c7a6b876fa2b7d0fb2dc254c04a755dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 05:58:09 +00:00
Karen Lu
d5504ea567 [automerger skipped] Revert "Use Mockito 4.6.1 API" am: 869fd2f33e -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I2dd83ff0750ae656a6c6bf916437bd107c172940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-05 05:57:49 +00:00
Karen Lu
d6a9cba834 Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev 2023-01-05 05:22:28 +00:00
Karen Lu
869fd2f33e Revert "Use Mockito 4.6.1 API" 
Revert submission 20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf

Reason for revert: Breaking the build on tm-qpr-dev. Bug tracked here: b/264473028

Reverted changes: /q/submissionid:20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf

Change-Id: Ie9d9d944093752f44eff67627e4a35f4df47e6de
 2023-01-05 05:15:10 +00:00
Matt Pietal
c617ae851d Update wallet setting availability 
For devices that don't support wallet, don't even show the setting in
a disabled state, which can cause confusion and lead the user to
believe they can enable it somehow.

Fixes: 251089510
Test: WalletPrivacyPreferenceControllerTest
Change-Id: I5d60957f24712bb4d75e72fa5f64cab35b6d6a5f
 2023-01-04 21:39:43 +00:00