Commit Graph

109531 Commits

Author SHA1 Message Date
jasonwshsu
87e0b3c7e5 Correct Magnification shortcut title in edit shortcut dialog
Root Cause: Magnification has its own edit shortcut dialog, but we did not
update correct title with getShortcutTitle()

Solution: set dialog title to getShortcutTitle()

Bug: 231531313
Test: manual test
Change-Id: I0679be2807a4b1f8b8a733604e16a35b0a1258c3
2022-05-12 17:33:07 +08:00
Jason Chiu
13232f0bb7 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: 72c259c604 am: 85353ab218
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: Ia996d6e2fdfdfba8eb7f4939a3ab899b1eeb929a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:34:26 +00:00
Arc Wang
3b6f843aac Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 4fb73340bd am: 7b1c65cfbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I0c8290637bab6095068a24cd5bc5979055fb85a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:29:37 +00:00
Milton Wu
9ac85225b6 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: e0a395afe7 am: 75a1650ca5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: Ifcd0d1886d2fec9b487c099ee03d4ca7397f2119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:18:10 +00:00
Arc Wang
f81a4817f2 Show USB flash drive in storage spinner when it's unmounted
Before this change, USB flash drive is removed from storage spinner
when it's unmounted (by option menu 'Eject'), however, USB flash
drive will show in storage spinner when Storage Settings page is
resumed again.

After this change, USB flash drive will show in storage spinner
even if it's unmounted. It will be removed until it's unplugged
from device.

Bug: 225095144
Test: manual visual
      Insert / Eject / Mount / unplug an USB flash drive and
      observe UI behavior.
Change-Id: I6b81766216c7850b018997f2de12a19d9d8675be
2022-05-12 16:17:12 +08:00
Automerger Merge Worker
1267556e7c Merge "Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1" into tm-d1-dev-plus-aosp am: 1f2cc00083 am: db476f23be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I76a1292736ac7174afb37e30e1e4f54e007fd46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:14:52 +00:00
Jason Chiu
aac10a5cc0 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 31b8a1eeb7 am: f10d8ebd68 am: db01ec9185
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I56b21cfba7242ef0d2bb9806aa3541dbb36939e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:11:37 +00:00
Arc Wang
4945971c63 Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 0bfff4cabb am: b3c53f061e am: 8582bbbba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I7c8312e79c9526ed2e16cfe9f81603afea362a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:04:33 +00:00
Milton Wu
cd2cf81101 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 41a960559d am: a9bbf4069e am: 2a5584ef81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I842bcd33eb82d29b830134de5e471e1b555c194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:00:49 +00:00
Jason Chiu
b5f312b41e Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: fdd88bc220 am: 3724a50eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I1fee7c23090b8331a4b2354929295351239a1b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:54:13 +00:00
Arc Wang
504dc5e136 Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 0d9772691e am: 2001b2d0d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I6bb99170d42b44a082bb14a3b532d8ede53c6017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:44:22 +00:00
Automerger Merge Worker
438c05f619 Merge "Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: 20cae9f9fd" into tm-qpr-dev-plus-aosp am: 0381113833
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I4ee7ab2ebae033cd78e1b190122ab2755c5727fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:31:27 +00:00
Peter_Liang
9b09c57578 Fine-tune the location of the logging for accessibility text and reading options.
Goals: To have the precise logs, move the previous logs to the proper location.

Bug: 222661478
Test: manual test
Change-Id: I74d99659d2b383222b381c430c3c373879f5cbdc
2022-05-12 15:09:04 +08:00
Yi-Ling Chuang
2fd14afaf5 Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: ccc866a16f am: c1fd1de25b am: 4013f6cbd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I9751fd8ca7ee20d6c2ca3452f45ba7946dd95a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:56:20 +00:00
Yi-Ling Chuang
9ff55bbc1e Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1 am: ab39e074a3 am: 5117debec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I204b5ac6d1d31b89557f07cc9b09fb7b725627f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:38:32 +00:00
James Lin
32310518ff Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: 97cfcae36d am: c34fce8adc am: 722244a95a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I08691fd6ce9c567212eae725bc232d8d13d72fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:26:25 +00:00
Hugh Chen
06139d3ffc RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
- Don't let device be discovered when the user launch "Connected Devices
  settings" through SliceDeepLinkTrampoline.

Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2)
2022-05-12 06:20:57 +00:00
Hugh Chen
c44b6fed73 RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
- Don't let device be discovered when the user launch "Connected Devices
  settings" through SliceDeepLinkTrampoline.

Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2)
2022-05-12 06:18:59 +00:00
Hugh Chen
9399a699d7 RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
- Don't let device be discovered when the user launch "Connected Devices
  settings" through SliceDeepLinkTrampoline.

Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2)
2022-05-12 06:16:53 +00:00
Hugh Chen
23ab123ba7 [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Bug: 228450811
Change-Id: I8e1ee6a97b57934b553a962f8f459d3f6afd746e
2022-05-12 06:14:37 +00:00
Hugh Chen
1c4142e1ae RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
- Don't let device be discovered when the user launch "Connected Devices
  settings" through SliceDeepLinkTrampoline.

Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2)
2022-05-12 06:14:27 +00:00
Hugh Chen
663066691e RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
- Don't let device be discovered when the user launch "Connected Devices
  settings" through SliceDeepLinkTrampoline.

Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2)
2022-05-12 06:13:00 +00:00
Hugh Chen
8bae222489 RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
- Don't let device be discovered when the user launch "Connected Devices
  settings" through SliceDeepLinkTrampoline.

Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2)
2022-05-12 06:11:48 +00:00
James Lin
29c90e879f Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 am: 99d0a952f2 am: c8015dd2c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I5d9aca99019fa27e247d67ab3e772b115fafba0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:03:34 +00:00
James Lin
8105b9e4d8 Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 am: ad62f6a29e am: a2b22c3a3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I5939f2d3f8f91dc2df9561a100a8c34b7f67a349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:37:26 +00:00
Jason Chiu
85353ab218 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: 72c259c604
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I60666d453e564399de402bd58aa266df2633a4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:23 +00:00
Arc Wang
7b1c65cfbb Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 4fb73340bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I6dd0f76ebf76ba59cf599dbb97970ba9d94cacf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:15 +00:00
Milton Wu
75a1650ca5 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: e0a395afe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: Ie2aecbc5336dad265bf59a476b95573aa4438a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:08 +00:00
Automerger Merge Worker
db476f23be Merge "Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1" into tm-d1-dev-plus-aosp am: 1f2cc00083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I551bc73b74eb68f5733849c529355b6cb9e13712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:02 +00:00
Jason Chiu
db01ec9185 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 31b8a1eeb7 am: f10d8ebd68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: Id1d42d1bbf36ef756487587be7ee04428732002b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:53 +00:00
Arc Wang
8582bbbba9 Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 0bfff4cabb am: b3c53f061e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: Id63bac3b711bcdd82040044c338074d5cec2dd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:46 +00:00
Milton Wu
2a5584ef81 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 41a960559d am: a9bbf4069e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I5af8929e9ea48fa3c522886631dd996e1905a4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:39 +00:00
Jason Chiu
3724a50eed Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: fdd88bc220
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: Id3f1d48a324bc40d2434689350254cfdffcdf98d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:26 +00:00
Arc Wang
2001b2d0d1 Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 0d9772691e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I41d6ad2cacfa3eafd38b38dec5600bec46220d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:19 +00:00
Automerger Merge Worker
0381113833 Merge "Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: 20cae9f9fd" into tm-qpr-dev-plus-aosp 2022-05-12 05:07:15 +00:00
Milton Wu
a84b3b02e7 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: 20cae9f9fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I73d8a7cbc74e471c5888b9ba9957f1a3ef0a1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:12 +00:00
Yi-Ling Chuang
4013f6cbd4 Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: ccc866a16f am: c1fd1de25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I60fff7db3dfd2483042d93546982d9a0ee677d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:10 +00:00
Yi-Ling Chuang
5117debec9 Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1 am: ab39e074a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I7af4a73a66934691a4cd93e77773445298b27d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:06:51 +00:00
Jason Chiu
72c259c604 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I4906409ca070d72b531a4a7ae8f37c2e1fa7d059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:49 +00:00
Arc Wang
4fb73340bd Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I3b0a710ff3794a1e459eb5a00e1d483e7831e4e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:42 +00:00
Milton Wu
e0a395afe7 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: Iac55576b1146d5a0b29af21058a6457dbbba0df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:35 +00:00
Automerger Merge Worker
1f2cc00083 Merge "Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1" into tm-d1-dev-plus-aosp 2022-05-12 04:15:31 +00:00
Jason Chiu
f10d8ebd68 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 31b8a1eeb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: Id86bc053a1d82c8320bf765312936b96e958403f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:26 +00:00
Yi-Ling Chuang
04e92f7f52 Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: Ia8ae816b1514b74cf8ed558a774269feb516bb88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:25 +00:00
Jason Chiu
fdd88bc220 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I1a404d8180063dadf7295ded340cc84821ae67af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:19 +00:00
Arc Wang
b3c53f061e Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 0bfff4cabb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I2b72522a23f615d98d9a7e8a39eced04399e456f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:19 +00:00
Milton Wu
a9bbf4069e Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 41a960559d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I0aaf2790cebad8a1fa44e059e59fb6ed83aa10f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:13 +00:00
Arc Wang
0d9772691e Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I38409cf180177ffe2d143a0adae43167cb25c947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:13 +00:00
Milton Wu
20cae9f9fd Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: If6a5e13f6986724d3d65ea5759d92d79862bf864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:08 +00:00
Yi-Ling Chuang
c1fd1de25b Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: ccc866a16f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I87d58a374fc4afbc1c8d3e5ce47d1803cfd23b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:06 +00:00