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
Qasim Javed
419b7fa289
Only cancel bonding if pair button is not pressed
...
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.
Only cancel bonding if the user did not press the pair button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed
Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 11:29:28 -07:00
Treehugger Robot
ab8bdb2bdb
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked"
2022-05-10 17:16:13 +00:00
TreeHugger Robot
fbbd1f1109
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-10 14:05:19 +00:00
TreeHugger Robot
3ffe35d0df
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-10 14:05:19 +00:00
TreeHugger Robot
1b42795ed4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-10 14:05:19 +00:00
TreeHugger Robot
8e13f26686
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-10 14:05:19 +00:00
TreeHugger Robot
10190793fe
Merge "Hide running time for "Android System" in the optimization page" into tm-dev
2022-05-10 13:41:55 +00:00
Bonian Chen
812de51467
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev
2022-05-10 12:35:30 +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
ykhung
7015cd0dd9
Hide running time for "Android System" in the optimization page
...
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I9d44fe8490ad5c684419b8ebf8d7d5576a42788a
2022-05-10 18:47:44 +08: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
Mattias Nilsson
36c71e9d47
Disable "SIM card lock" when the SIM card is PUK-blocked
...
For an inserted PUK-blocked SIM card we should not allow
to open lock settings. Add a check for SIM_STATE_PERM_DISABLED
and disable "SIM card lock".
Test: Insert a PUK blocked card and check SIM card lock
Bug: 230370597
Change-Id: I8b468cefe95fb8bd66ab91d6c4569ddb01473fbe
2022-05-10 10:46:56 +02: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
Chaohui Wang
61161eab14
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: I789d73993aee19eeff574cd6e5d99714f48742f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 06:06:25 +00:00
Bonian Chen
b0e2411297
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: I9c2056dfb62576bfc7dd87df6a1a58ef0aa7095e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:43:38 +00:00
TreeHugger Robot
3433f8a9b2
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: I8827eff74dc89e58ac1b8c0e41bc2b1a44c20505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:43:16 +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
Bill Yi
7ada1a1b2e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-10 05:22:10 +00:00
Bill Yi
5898a6df49
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-10 05:22:10 +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
Bonian Chen
8b06c96fe9
[Settings] Hide some Preference entries when no mobile data support
...
Hide some Preference which requires mobile data on device didn't support
it.
Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
2022-05-10 01:12:23 +00:00
Jack He
3671fb8438
Merge "Cancel bonding upon back gesture."
2022-05-10 00:09:48 +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