Commit Graph

105032 Commits

Author SHA1 Message Date
Julia Reynolds
e4c2786e46 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: Id48b84971ef57eed3352539021af0f077febc683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:50:06 +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
Kuan Wang
cfc3b93fb7 Add string "Battery usage settings" into Reset App dialog. am: a075405517
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332037

Change-Id: Iaa841bf77a1cbcc08d9a49af856232082a7987b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:39:13 +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
Kuan Wang
a075405517 Add string "Battery usage settings" into Reset App dialog.
Bug: 222037028
Test: emulator
Change-Id: I5482de6573d34533db35c82136af13c03a34b7ab
2022-05-12 12:13:25 +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
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
Yi-Ling Chuang
ab39e074a3 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: I8d07303307c667c956034fc38f634cd2e1ae7f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:02 +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
James Lin
722244a95a Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: 97cfcae36d am: c34fce8adc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

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

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

Change-Id: Ic676ce5129e77d6302e814a89b2fb11728587b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:28:32 +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