PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,850 Commits 1 Branch 0 Tags
ee56e95f907f83938ce465b14c6a16f59f7ce79c
Commit Graph

105850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Behnam Heydarshahi
ee56e95f90 Merge "Implement a separate controller for ring volume" into tm-qpr-dev 2023-01-11 14:08:01 +00:00
TreeHugger Robot
fb0986623f Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev 2023-01-11 11:05:12 +00:00
TreeHugger Robot
ecb7c54fc5 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev 2023-01-11 11:05:07 +00:00
TreeHugger Robot
8dc66bc482 Merge "Update string" into tm-qpr-dev 2023-01-10 19:28:16 +00:00
Julia Reynolds
fc63046f32 Update string 
Test: view string in UI
Fixes: 262094151
Change-Id: I4f55c340d3144d446465d64008d9d92d622425ae
 2023-01-10 16:23:57 +00:00
Lucas Silva
e33639f117 Only show communal settings to the primary user 
Fixes: 264284347
Test: flashed device, and verified settings don't appear for secondary
user. Setting still appears for primary user
Test: atest CommunalPreferenceControllerTest

Change-Id: I6686ce4dbc7d708a93131620ae93c5e0dc323995
 2023-01-09 15:15:27 +00:00
TYM Tsai
be9cb36c6e Fix html injection in Autofill confirmation dialog 
AutofillService can inject html in its label. The label will
be padded with line breaks which puts the warning off screen.
To fix the issue, disable html injection of the label.

Bug: 216117246
Test: Manual, check the label of the sample in
      the confirmation dialog
Change-Id: I244d8e9eadbacae6af615d1d2a5a99c86e4fa456
 2023-01-09 08:35:56 +00:00
TYM Tsai
a1ca72224d Fix Content Capture service starting after restriction 
When a device owner and a profile owner restrict Content Capture,
there should be no toggle setting to turn on Content Capture.

Bug: 250573776
Test: Manual. Use setps on the comment#3,
      make sure no toggle setting in the Privacy page.
Change-Id: Ia17f852b224c67b9c1cf5846ee9ad5592a485bab
 2023-01-09 08:34:40 +00:00
Bill Yi
9f8b28eaf4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I76b6b2f37d0dee1347d3c5b16b9d6ba3088b31aa
 2023-01-08 02:43:59 -08:00
Betty Chang
30783964b3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: ddeff2f67f -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I0fbd5e7104445bc1f4176c56522b335870b1c7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:39:48 +00:00
changbetty
e7f0596113 [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: 7888fcc82b -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I6c0fb65c5ce73586624b75929a6992bc3a58a4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:39:46 +00:00
Betty Chang
ddeff2f67f Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713

Change-Id: I66295604e4413f7c6d9a1067abeab07b14eeae63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:01:20 +00:00
changbetty
7888fcc82b [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713

Change-Id: I3b67d30e794dd06a689c57c9fd6b948bbea362f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 08:01:18 +00:00
Yanting Yang
d0c69f7ae7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -s ours am: 618af44b70 -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: I87141bf0fba2bd6b66fe0fa59377138271e0576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 07:24:10 +00:00
Betty Chang
145d91b832 Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev 2023-01-07 07:23:30 +00:00
Betty Chang
cfc1569f12 Merge "Change the intent flag to immutable" into tm-qpr-dev 2023-01-07 07:23:02 +00:00
Yanting Yang
618af44b70 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -s ours am: b842d569bf -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: Ida9886743b149f43cab923e5f56778065e7e04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 06:49:11 +00:00
Yanting Yang
b842d569bf [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -s ours am: b1391d7eb2 -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: I4160c9fba6190b73af1d9b18ce90975b99eb38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 06:08:06 +00:00
Yanting Yang
7396023ddb [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: 9038a26635 -s ours am: 36a4373792 -s ours am: 0e2bf4c870 -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: I4c5ba7e1963c08e7d695fb86bca0fdcbd61c67e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:36:40 +00:00
Yanting Yang
b1391d7eb2 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -s ours am: 8c70085bab -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: I17851351e33f65ae9ae187114fe73358c0dfecc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:36:33 +00:00
Yanting Yang
fac442ae58 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours am: 46c8caa6cc -s ours am: b2943c3888 -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: I12feb4c19f82efcbb56b23925abb0ab6712a31ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:36:31 +00:00
Yanting Yang
0e2bf4c870 [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: 9038a26635 -s ours am: 36a4373792 -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: I6b2e3322b8f8a77ab8662d357c0aa3883872207d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:06:03 +00:00
Yanting Yang
b2943c3888 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -s ours am: 46c8caa6cc -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: I6f24cab1ae2f1768077ff8231588dc2b44d7584d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:05:56 +00:00
Yanting Yang
8c70085bab [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -s ours am: a617639496 -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: Icc64822c71d77308f1c60911a4d6154815e05647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:02:49 +00:00
Yanting Yang
36a4373792 [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: 9038a26635 -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: Iee799fc77384e15c10a0a7f15cde1e0637389dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:30:41 +00:00
Yanting Yang
a617639496 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8 -s ours am: 6326f5e65a -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: I54e4d0d1c79014920ddffe4a945423b624d10104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:30:33 +00:00
Yanting Yang
46c8caa6cc [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada -s ours am: 1b30190fe1 -s ours am: adc9a200ac -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: Ib323120650a042e24732c749b6b5521894299af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:30:29 +00:00
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
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
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
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
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
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
Grace Cheng
a301ba8a68 Merge "Adding product string variants on choose lock page" into tm-qpr-dev 2023-01-04 20:30:37 +00:00