Commit Graph

103306 Commits

Author SHA1 Message Date
Automerger Merge Worker
78fa65b2be Merge changes from topic "am-38c2777666e34c669ef9b159b634e16f" into tm-d1-dev-plus-aosp
* changes:
  Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours
2022-05-10 21:05:15 +00:00
Yanting Yang
604c3c3f22 Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: Ib554be5157dd5cb5d39902eb75b71fa2490d62df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:04:09 +00:00
TreeHugger Robot
ade25b3d36 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I3145ff5669671b4f26f4d7072591dcdf76f201f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:03:52 +00:00
Bill Yi
22623e17a7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3e8a34f2782bd5286847400ec4b69c041d69a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:03:45 +00:00
Martijn Coenen
ffef837a93 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: cf79b0fcf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: Id7e7b020df7b7ba22e82bf80ac1b541d915ca48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:03:14 +00:00
Menghan Li
56665fb64f Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: 347aa6f934
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I29a3b5d27fc77ecb1ebc5bb76fd8ee32e27d8fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:02:38 +00:00
Tsung-Mao Fang
551d742d83 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 4e09433546
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: Id8befe820b0df6bf057e952f56cc66a3d52ae4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:01:50 +00:00
Bonian Chen
aea13c2400 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 657a4f7549
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: Ie59e7070cd81c5bdfda61934f82b219f7b21e489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:01:38 +00:00
TreeHugger Robot
241baf7389 Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 31b30c123c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: Iceff0b60a1a44cee4c18bc8145f69ee98877a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:01:30 +00:00
SongFerng Wang
4f0d8249a9 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 992e20d2af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: Ic6fe5a86bf53a1dc67100152dd30199d4d2b97df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:01:15 +00:00
Chaohui Wang
708e5e6ab4 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: b36e15c613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I81aa8524cbe16d0d64b1a30c4669db72d9f1980e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:01:06 +00:00
Yanting Yang
7031c01a9c Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I63a74eece6489253bc76c2578c125f1f6e2451fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:31:16 +00:00
Martijn Coenen
cf79b0fcf0 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I033f09aaf7800e383de7a769b2e269b3ecf1c8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:31:08 +00:00
Menghan Li
347aa6f934 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I56d876311ce7a625e69dc3315d1ee3074519ceb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:31:01 +00:00
Tsung-Mao Fang
4e09433546 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I81bf6663ec88a1de1578a38317031cdec9b912ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:24:05 +00:00
Bonian Chen
657a4f7549 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I027d1e0e7ed8168a3ce677c2b901aa2747c24eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:23:27 +00:00
TreeHugger Robot
31b30c123c Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I21114cb9c3a52a23854f836a120b812f94c923ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:23:18 +00:00
SongFerng Wang
992e20d2af Merge "Reuse the active esim slot" into tm-dev am: b1613b210d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I64749537cb7fa639c7ce6dd1ed76e15a0a969cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:22:41 +00:00
Chaohui Wang
b36e15c613 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: Icbc2a7520a49da31df63e0b73b8cb00c005cb1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:22:29 +00:00
Yanting Yang
51204e3deb Merge "Fix reset app preferences for work profile apps" into tm-dev 2022-05-10 12:25:59 +00:00
Chaohui Wang
22bdda8861 Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I8e30238449dca001ccc6ac707fca89f55f1a4790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 09:46:13 +00:00
Bonian Chen
91a2f3c2a3 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I4238d8b00cfc59739ad22875621ae9e198310a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 09:46:00 +00:00
Martijn Coenen
63db54c290 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev 2022-05-10 09:18:52 +00:00
TreeHugger Robot
36d2c74941 Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: baba62294b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: If4e36f14157ffab5a5b77c3f428998c15b19bb55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 09:15:55 +00:00
Menghan Li
f7b967ffd4 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev 2022-05-10 08:42:32 +00:00
menghanli
4a35bf929a Remove "Remove animation" assistive technologies in setup
Turn on "Remove animation" will cause setup flow becomes slow in response. The educational videos and animations (such as the ones used in onboarding) should NOT adopt "remove animation". Will postpone this feature until Android U.

Bug: 227284067
Test: Manual testing
Change-Id: I57f2d4513372e8deeabcd784896dc0ffbea145c8
2022-05-10 08:42:15 +00:00
Tsung-Mao Fang
ca72e5c333 Merge "Disable setting items in App details page" into tm-dev 2022-05-10 08:17:57 +00:00
Bonian Chen
2d72d9f450 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev 2022-05-10 07:51:16 +00:00
TreeHugger Robot
3dcb2b65f7 Merge "Cancel bonding upon back gesture." into tm-dev 2022-05-10 06:31:28 +00:00
Chaohui Wang
80e74b7f0f Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I1348ca8869c1238a44f9a06dc278a6fae905d277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 06:26:08 +00:00
SongFerng Wang
b1613b210d Merge "Reuse the active esim slot" into tm-dev 2022-05-10 06:25:07 +00:00
TreeHugger Robot
088de1fbac Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: Ib31cf6b2a286a1f783559b8b09da5ced249ee397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 06:11:06 +00:00
Bill Yi
7323d0e02e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e5258a9114cc426d9bb0e2b80a1757cf2fcd50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 06:10:55 +00:00
Bonian Chen
4c3dda2bbd Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: If7ce59c6a1557243d4e5f23fa3c1452ae7cb98e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:37:28 +00:00
TreeHugger Robot
baba62294b Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I95787dcf320489fa8b8b42b985c6a81a71eba27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:37:17 +00:00
TreeHugger Robot
0c8f044705 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I53c6086ae26936f7e182b692cb51d958d5e566a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:12:33 +00:00
Bill Yi
d4631b0d42 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75fd6f3a5a0ce5180a987110c5c5e33eb54515b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:12:14 +00:00
Bonian Chen
d2c9581b44 [Settings] Broken test fix - SimStatusDialogControllerTest
Avoid from test broken - SimStatusDialogControllerTest

Bug: 232040460
Test: unit test
Change-Id: Id5cedd92f008df232234a19d9894e6eb8d39959d
2022-05-10 12:20:50 +08:00
Chaohui Wang
1107c1c220 Merge "Fix Voice Access scroll down in the Add network" into tm-dev 2022-05-10 04:15:07 +00:00
Chaohui Wang
9b28ecf9de Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev 2022-05-10 02:44:47 +00:00
Bonian Chen
bd971968e9 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev 2022-05-10 02:25:51 +00:00
TreeHugger Robot
12f552f22e Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I02908155a6567d757b46901194f2633314da1543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:12:05 +00:00
Bill Yi
3abfb845b6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94f24eb788a5336e4bedf83e21e9b3bb05f590b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 02:11:51 +00:00
TreeHugger Robot
cb38753530 Merge "Fix More details not work on fingerprint" into tm-dev 2022-05-10 02:09:51 +00:00
Julia Reynolds
c92e89217f Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I7d6153f6f46a116a3a25872dc422a59b02ffd1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 23:57:18 +00:00
Yanting Yang
ee0931f5ba Fix reset app preferences for work profile apps
In the past, Settings didn't support resetting the disable status of
work profile apps, it doesn’t follow the behavior that the reset dialog
mentioned.

To fix it, we are going to check apps by enabling user profiles and user
id. If the work profile is enabled, we will also reset them when users
select to reset app preferences.

Bug: 187387211
Test: manual
Change-Id: I25fd0129335539a23ed2ee0af57fdd9714eddf74
2022-05-10 07:06:14 +08:00
TreeHugger Robot
f1167898b7 Merge changes from topic "tc_change_20" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
  Import translations. DO NOT MERGE ANYWHERE
2022-05-09 23:02:43 +00:00
Raphael Kim
8f32fa54f7 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: 197d19654f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: Icdfe37ff28d24d37a7d62686656a837cb52a8419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 22:34:30 +00:00
Yuri Lin
7ac6bb4d61 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: 475ee039ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Ifa6599f54d191244c2dc1af47ce9a673d00e3a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 22:14:49 +00:00
Julia Reynolds
8e41734caf Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Ifb623c3650ae1c46efa0485979f412b80896b11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:48:00 +00:00