Commit Graph

104036 Commits

Author SHA1 Message Date
Jason Hsu
76ae78452d Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev 2022-05-12 13:14:46 +00:00
Julia Reynolds
ec99d3cbfb Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 38addd9f8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I5ae98057b021817ddd2e179d97ac8f1132f926a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:52:20 +00:00
Julia Reynolds
265ac4148c Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I215afd39c21e68812732bbc02f9178e621782995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:49:24 +00:00
Julia Reynolds
2d251eaa2e Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I43fe4faf8494593743293333756a142d256eddf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:27:10 +00:00
Julia Reynolds
38addd9f8d Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: Ief0ddf880d27a11b693bd01a1a6f7c033b8b4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:26:54 +00:00
Julia Reynolds
9372f3b4e3 Merge "Use NMS calculation of fixed importance" into tm-dev 2022-05-12 11:55:40 +00:00
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
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
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
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
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
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
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
Jason Chiu
4aad83a270 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

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

Change-Id: I412de81ecded6276df9eca10d4bb0d4db33b91b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:54:34 +00:00
Jason Chiu
56c7f91cea Merge "Add summary strings of "Tips & support" for tablets" into tm-dev 2022-05-12 03:47:22 +00:00
Arc Wang
69bfb2ad1a Merge "Storage Settings crash" into tm-dev am: 241238c6df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

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

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

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

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

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

Change-Id: I4d5346f3cc0764cb94aad41a19ccf52a6b0b0831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:45:30 +00:00
Arc Wang
241238c6df Merge "Storage Settings crash" into tm-dev 2022-05-12 03:39:58 +00:00
Milton Wu
bd31deb476 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev 2022-05-12 03:26:09 +00:00
Yi-Ling Chuang
f6c416054e Merge "Make the force stop dialog work properly in split screen" into tm-dev 2022-05-12 03:23:11 +00:00
James Lin
c34fce8adc Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: 97cfcae36d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

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

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

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

Change-Id: Ic5e68e6647e6476d12b711e211a7d93fba92e083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 02:30:14 +00:00
James Lin
14c7ce7ccb Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev 2022-05-12 01:26:34 +00:00
Lifu Tang
f29a071fca Cache summary text to avoid flickering
Bug: 231927706
Test: build, flash, run unit test, then test manually.
Change-Id: Ia0585302c5cf86cd6035315fa750c71b9df55237
2022-05-11 15:52:23 -07:00
Ayush Sharma
f661c3a21b Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 71d5366bf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I50979707076f5c23223759faa42b23dd23246412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:56:18 +00:00
SongFerng Wang
624f7ff6e4 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: e48d3f8cc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I7f9fd919138ccb9278fab1663742d909604178e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:48:21 +00:00
Tom Hsu
011bf465fd Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: a3b5860398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I29d101bc524384f3f5304c5deae825e898fcbd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:46:55 +00:00
Ayush Sharma
cd10322d6d Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 02d58f0109
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I1dae906847c895beef40a731d6e45bf59d411670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:43:02 +00:00
SongFerng Wang
d100f24a62 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: bde99c02cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I2b7d2833a72412e359fa1680ab2852edec58672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:51 +00:00
Tom Hsu
b90a6c8c81 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: b903b4a057
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I6bc2490339d6052629c722fe89f8547f3cb7c978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:32 +00:00
Ayush Sharma
02d58f0109 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I0e71a2917ae7b26073d9de217e7909c729084613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:28:24 +00:00