The Android Open Source Project
8fac6c5227
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808
Change-Id: Id46cf9f787c5d104d41aa9b613d30a987f6682b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:36:00 +00:00
TreeHugger Robot
1f8ab25a4b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279
Change-Id: I74cb07c482cee5051f3bd5e387bc0678fba4e03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:55 +00:00
The Android Open Source Project
9db4d03357
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812
Change-Id: I4c3250c78f5f1a73c89c6fc1758eaeb35c6b2a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:47 +00:00
Bill Yi
4a4cd6db20
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279
Change-Id: I0a40cc839687a70fe523988c996ce170640ffac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:45 +00:00
TreeHugger Robot
176fb51f4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808
Change-Id: I01039a5ec2ca4703abcaddd228487d04b9e8e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:45 +00:00
The Android Open Source Project
0e3016543c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808
Change-Id: Ifd28966e0291d3423afdbb04914a7e38229ee0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:44 +00:00
TreeHugger Robot
ab1590098a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279
Change-Id: I563f7cc92fbdf7b7623fb9a90f431a476f06186d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:35 +00:00
TreeHugger Robot
546674359c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272
Change-Id: I48372d1ad6b3b2fd06d271f5b9314334498f09f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:31 +00:00
Bill Yi
50a4ca36cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272
Change-Id: I8588e3ee98204659fa74a302d742e495ff1d5b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:19 +00:00
Bill Yi
54784f7246
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279
Change-Id: Ib7c5778d81d69f7a77284ba821b37d41f3dc4aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:15 +00:00
TreeHugger Robot
89707b8827
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272
Change-Id: Iec9507e641c034361f7718e33e05e882bf96853a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:35:02 +00:00
Bill Yi
44717d3500
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272
Change-Id: I0b65a2f3454a8adce9b28322bc5c62298760dea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:34:54 +00:00
TreeHugger Robot
94cd8ad610
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: I5d376446bd0ebd63b5fd824949b4d252ca710233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:48 +00:00
Bonian Chen
4522fcc0e3
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I7a143267b8dee871b74f6fafe1b542610f920dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:41 +00:00
Yanting Yang
8ed215f1d5
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: Ib9bf92aaef59dffe8018e40f120eb1cfc36a652b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:33 +00:00
TreeHugger Robot
ccd8147776
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iba2eb763ef4599ad0073c024828a5ecffdfee8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:31 +00:00
Martijn Coenen
d27247a86f
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: I159b183cfb528e7b50e59334e1dc14204d4b0dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:26 +00:00
Bonian Chen
33bc83f19e
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I44235c6398195e24682857ccf5b292b4947e4b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:23 +00:00
Menghan Li
60fa69d732
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: Idd37d907aa054e9e3d66ad4ca35b0b10b96dea15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:19 +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
e9ee4698f9
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: Ia698c953b6d3e259d6fccfab76e98cdc237b407c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:08 +00:00
Bonian Chen
a86e4475b2
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: I249ced576a98177ce0429607ee305d095a94b9b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:25:51 +00:00
TreeHugger Robot
cf6dbff356
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: Ic2db30810a06750467099ae69bdcf0f71ab6e63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:25:44 +00:00
SongFerng Wang
1b42068491
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: Ifddb198129b2d79f0a56011b3a1b2479754c8155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:25:17 +00:00
Chaohui Wang
98df72de33
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: I8ae84d59155ac584a78fcc156419ddf3b4e87c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:25:10 +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
Chaohui Wang
afd6c366e8
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f am: 22bdda8861 am: 02ddd9a642
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I92384109c34e736afd1c38847292ae70a6c9caf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 15:52:30 +00:00
Bonian Chen
f51b9cbf15
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd am: 91a2f3c2a3 am: 09efd55ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: Idd54facbef93cd808bac24f0962af85bd976bdc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 15:52:13 +00:00
TreeHugger Robot
b1d0706074
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: baba62294b am: 36d2c74941 am: 357a85747b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: Id1a5be54e2f35604936b5e45cf715ca2297b17fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 15:51:55 +00:00
TreeHugger Robot
098e4ca71f
Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e am: 088de1fbac am: e8a6ae309c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: I30f98a369370a61996541b34d858e7801ebc676b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 14:12:35 +00:00
Bill Yi
0c649f23d3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours am: 7323d0e02e -s ours am: be4d2bb32a -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: I86e087b2721b0eee701a0124640980cafa938647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 14:12:24 +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
Chaohui Wang
02ddd9a642
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f am: 22bdda8861
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I6bfd3464f77a215a541aeb64526f614b5088dbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 12:50:58 +00:00
Bonian Chen
09efd55ebb
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd am: 91a2f3c2a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I4fabf12c79d4ef7ed3ce927a75d50739b97eb20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 12:50:43 +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
TreeHugger Robot
357a85747b
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: baba62294b am: 36d2c74941
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I9fe675528076ee90f1b20874b2d45cefd1c7091d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 11:44:30 +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