TreeHugger Robot
15c41cec8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 89707b8827 -s ours am: 2825fdf175 -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: I5dd3a616d7660b8611dc25edd94e46bda085f965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:35:07 +00:00
Bill Yi
8fea7472e7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: 44717d3500 -s ours am: 6921b850c3 -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: Id12750479e83a231f9ffd37e300175f7b9e2ea2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:34:53 +00:00
TreeHugger Robot
bfeff3bfc6
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: ccd8147776 am: 435a8ae837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Ibc8f16ad8dc14b91f2856108e6db82bc7925fd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:30:37 +00:00
Bonian Chen
9370dcd84d
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 33bc83f19e am: c8433b8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I4a1dda519fb7522703cf217d6ec00b8ee2ec37eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:29:30 +00:00
Automerger Merge Worker
00149b77bd
Merge changes from topic "am-38c2777666e34c669ef9b159b634e16f" into tm-d1-dev-plus-aosp am: 78fa65b2be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: Ib0fb1a2595796999f1d89603bfb0f5c8a85e92cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:27:42 +00:00
Bill Yi
010e310498
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours am: 22623e17a7 -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: I0f84136bd0bc1747dd4a6f05968b6f2edd4099d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:27:31 +00:00
Yanting Yang
f79c8af9dc
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c am: 604c3c3f22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: Ibc647906b3961bd9c3d703de990c08266dba5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:23 +00:00
Martijn Coenen
c696bdbaa4
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: cf79b0fcf0 am: ffef837a93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I2bfcae49748ec67f73e1582cbd94a81a36e599db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:17 +00:00
Menghan Li
93720ec860
Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: 347aa6f934 am: 56665fb64f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984
Change-Id: I56e1419c6c8056647a6f8d8d2b3cbe51b887e384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:19:34 +00:00
Tsung-Mao Fang
984cbd60ba
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 4e09433546 am: 551d742d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Ia7c2fa6739d2b424601ef0f9d637095af7c91836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:19:26 +00:00
Bonian Chen
128df146c2
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 657a4f7549 am: aea13c2400
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: I3340d34300a9e4a8d937b822aa2a805e3e7125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:54 +00:00
TreeHugger Robot
22e20f3d18
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 31b30c123c am: 241baf7389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: I62261e6f9143b1de9d2c2f5181fda2447a4b226f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:49 +00:00
SongFerng Wang
0331308709
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 992e20d2af am: 4f0d8249a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: I8aa5478ca624312e5857be3623f13cc70d87b6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:34 +00:00
Chaohui Wang
c0f056a185
Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: b36e15c613 am: 708e5e6ab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874
Change-Id: I35d89a835dd04792ce235791722abb406d3d3dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:01 +00:00
TreeHugger Robot
2825fdf175
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 89707b8827 -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: I30db5a72651d5f60373d56d595facf8651775cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:11:56 +00:00
Bill Yi
6921b850c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: 44717d3500 -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: I2f7a49df88aa8152d87281ce41eb6130b6bbfab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:11:46 +00:00
TreeHugger Robot
435a8ae837
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: ccd8147776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iaa804c69d8744a07de575fd57c57eede2ca6a7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:33 +00:00
Bonian Chen
c8433b8435
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 33bc83f19e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I979f44db2bc52cdef0b1e48a88457856a10cfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:04 +00:00
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
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
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
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
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
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