The Android Open Source Project
|
c6f5280b23
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: d6c71eeac6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214813
Change-Id: Ica7080d1cf23f24cbe39a110c830fa3bbdb51796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:49:22 +00:00 |
|
The Android Open Source Project
|
2001665468
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: d6c71eeac6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214813
Change-Id: I6c0daf0f90dbee55946f40033817a4391a2791fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:48:54 +00:00 |
|
Bonian Chen
|
f6aaa67c29
|
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 am: 68f0010133 am: 8c908065c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: I68b6f354e8fa7df5ca84c62a03ac70eab636b878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:47:33 +00:00 |
|
TreeHugger Robot
|
778a3ab606
|
[automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa am: 2c5f09d6b6 -s ours am: cd2294ad10 -s ours
am skip reason: Merged-In Ia790e345be811be1b60762ff819544d03c5a18fd with SHA-1 78765b0b26 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: If5936a1897f32a8cf9d00624f16315973259d1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:47:24 +00:00 |
|
SongFerng Wang
|
200eef2efa
|
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d am: a3a3842259 am: 1bb463b84e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: Id2d1b7c1cd04dcf874953d69982e62092940e0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:47:17 +00:00 |
|
Chaohui Wang
|
405589916a
|
Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 am: 2d2833cf9b am: b4804298db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874
Change-Id: I2b6fcfc3a5ee0813cbb4c049e30363bd8c9608a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:47:06 +00:00 |
|
Arc Wang
|
eaaa731910
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: 2752aa641b -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Id964b9cd1888322db14ca28bb466a8be481b7092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:45:07 +00:00 |
|
Arc Wang
|
c5af6fcef5
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: 296da54a32 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I97866b9506c4947a4914703d9534917b798b525b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:45:05 +00:00 |
|
Arc Wang
|
b0d003ebbb
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: f7d9b67053 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Iac18f9154c384a69b3b186abb257f5abfb70e966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:44:54 +00:00 |
|
Arc Wang
|
657359db44
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: b5375fbb21 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Ie547567692a7686404c3d4570eb4ff6b606a675f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:44:52 +00:00 |
|
Arc Wang
|
89c2e74bbf
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: ac534873d3 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Ie21c363b50a1c5547c40f75a77a08054c443196b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:43:52 +00:00 |
|
Arc Wang
|
83f6c64b50
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: 21427989dc -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Iec220cf9bc200c495148839965bc8d3e8676d747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:43:51 +00:00 |
|
Arc Wang
|
51ba24633b
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: ac534873d3 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I4a475043c1297ff272682b69e230b3210e1c9983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:43:49 +00:00 |
|
Arc Wang
|
31833cb931
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: 21427989dc -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I629d74892ba435dd60c66554d5c69b6cdc95502d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:43:48 +00:00 |
|
The Android Open Source Project
|
d6c71eeac6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214813
Change-Id: Icabbd8e495e2e8cb807740d46f4c2c6fc831a716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:37:30 +00:00 |
|
The Android Open Source Project
|
249269c95d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214813
Change-Id: I471c5812af4b17c7a489c70ef3e9e45291b6b0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:27:54 +00:00 |
|
Arc Wang
|
f7d9b67053
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I93365f83bcd2ff2df4a7a863a341cf1ff5a78ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:27:13 +00:00 |
|
Arc Wang
|
b5375fbb21
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I3f282845194a59afc72d625d952cf6c629ca8962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:27:05 +00:00 |
|
Arc Wang
|
ac534873d3
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I0acfc40d6b5ec0b685f5500ec2a2108fe3ad88dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:25:29 +00:00 |
|
Arc Wang
|
21427989dc
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Ic9f13dd1f7f0e7cc7d15303b0c109bf2cc6c5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:25:28 +00:00 |
|
Arc Wang
|
2752aa641b
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Ibc042ed231e8091e8d751ecb26f2abfd7e03c962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:25:06 +00:00 |
|
Arc Wang
|
296da54a32
|
[automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I4b8476f07c35fc42044f5cbab6fd52fd5e5ce228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:25:05 +00:00 |
|
Chaohui Wang
|
4ea320a09a
|
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 am: bf652e736b am: b08dfb2a16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I7410ec2ea91f84a4223fc1ad4f9204db0c2a1064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:15:55 +00:00 |
|
Jack He
|
939e53fda2
|
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a am: 55da62f36e am: 272eedba22 am: a79435beb5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: I138d002b88bdd06e88c9fd3ebf46a0b7c19c4954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:15:49 +00:00 |
|
Bonian Chen
|
6c9bffbbe4
|
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 am: 129c031930 am: 6527793b66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I6379c30a482dbbae9f50af3189427dc436bb842d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:15:42 +00:00 |
|
Treehugger Robot
|
976d920650
|
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3 am: 9bd8bec2df am: 1543eff3c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I2bf82109e104c1dfcd6656f086b2c8e9851c4a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:15:37 +00:00 |
|
TreeHugger Robot
|
3cdb14a480
|
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 am: 2d72c0e67e am: 808874d13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I523df29000b4b129a92f0a99098dfbef281f7f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:15:34 +00:00 |
|
Jack He
|
49e355a88e
|
Merge "Cancel bonding upon back gesture." am: 3671fb8438 am: 56b5fa0fb1 am: 36be40cb5f am: 8203f157ed
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046
Change-Id: Ie093d5cc2b8b222178d2afcbee6e8eb0c8a56afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-11 00:15:21 +00:00 |
|
Arc Wang
|
8fba3eef08
|
Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev
* changes:
[automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5
[automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
Verify ringtone from ringtone picker is audio
|
2022-05-11 00:04:32 +00:00 |
|
Bill Yi
|
8a3c25db7f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours am: 9825da46ff -s ours am: f86a4fa7b1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214802
Change-Id: I0d31835c8ca8e7383d8c55866f7ae6b0912a5e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:59:47 +00:00 |
|
Bill Yi
|
123a321028
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours am: b781b9c38d -s ours am: 1f18e77bb5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214802
Change-Id: I3b6761821ac39d16c92bd9ce694bbdee5ede3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:59:40 +00:00 |
|
Bill Yi
|
abe03493bb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours am: 059234f150 -s ours am: e065c811c3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210276
Change-Id: Ib1dc4b3dd9bcc4fc37b7ae6d465492f7a0797f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:59:24 +00:00 |
|
Bill Yi
|
6cf5b23387
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours am: 72fbe398ca -s ours am: 563f8694db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210276
Change-Id: I722a12738905da124af5931b3d0faa32f7f7b7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:59:03 +00:00 |
|
TreeHugger Robot
|
23a2a791fa
|
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: 7e3c63dcd5 am: 0fa9182b25 am: 2f9fd60154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: I4827ab56db32f2ff006fe91ee259792121f18c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:54:00 +00:00 |
|
Bonian Chen
|
2ffee2ffea
|
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 2a1040e1e2 am: 2dad1245e6 am: 6b814f7e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: Ia2bfdcce432e88640823fcc83aa911fb73105860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:53:49 +00:00 |
|
Yanting Yang
|
49e861ad51
|
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 799f7218cd am: 641b5b67b0 am: 50944a0bdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: I5dc16e5805a87756567377e79ab09df44c01acad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:49:45 +00:00 |
|
Martijn Coenen
|
44baf8897d
|
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: d77f3426a2 am: 534a851e32 am: f246a543a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I7b88e20906d99dbf086eb27d0d377362685bdce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:49:39 +00:00 |
|
Menghan Li
|
4ebbf24f67
|
Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: efdfca87d8 am: d83bb8f209 am: 6f804c9892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984
Change-Id: Ieba808dd92195e0905b1250da4c5adc128576860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:49:28 +00:00 |
|
Tsung-Mao Fang
|
c00551fa9d
|
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 am: 695503018c am: f2f8618d62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: I45bbf1ab86905d754451786b9201cefce1346f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:37:01 +00:00 |
|
Jack He
|
a79435beb5
|
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a am: 55da62f36e am: 272eedba22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: If8f0a915f938ddf220e51af43b633a252626454b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:34:35 +00:00 |
|
Treehugger Robot
|
1543eff3c2
|
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3 am: 9bd8bec2df
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I107f2dda84bf0b9c63ad043d2cd4b87425375f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:34:29 +00:00 |
|
Jack He
|
8203f157ed
|
Merge "Cancel bonding upon back gesture." am: 3671fb8438 am: 56b5fa0fb1 am: 36be40cb5f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046
Change-Id: Ie5794e6d02595c7f30c7dcf0a9979414f625200e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:34:18 +00:00 |
|
TreeHugger Robot
|
a4d9992262
|
Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 am: 97b69588df am: ba651dcdce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666
Change-Id: I9d29a0b912ffd8f5ea5b1c5908104a6c457c7c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:28:20 +00:00 |
|
Bill Yi
|
d83478d312
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours am: 1fcabe2452 -s ours am: 54859fcba0 -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: Id0706466ab17bca398f8191213693e822fcdf575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:28:10 +00:00 |
|
Bonian Chen
|
c88460e5a4
|
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 am: b0877cfa9a am: 66a399a0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: I098382b0c8bad9b5bbb1ec3c112d5a2ea428c456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:17:53 +00:00 |
|
TreeHugger Robot
|
3e67f5ace2
|
[automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa -s ours am: dd348882d7 -s ours am: 8b8c3b45bd -s ours
am skip reason: Merged-In Ia790e345be811be1b60762ff819544d03c5a18fd with SHA-1 78765b0b26 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: Icf09223307bc92e1b66118d1229a807883165f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:17:47 +00:00 |
|
SongFerng Wang
|
c507624bd6
|
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d am: 33f243f937 am: 8a60ff49d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: Id8fa725f10651f65f46f1e662f412d54aeac6539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:17:42 +00:00 |
|
Chaohui Wang
|
123e1df459
|
Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 am: ec4a4248a2 am: 488dceed93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874
Change-Id: Ie22dc3731a67de6be432855e0f76c50ed147b8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:17:34 +00:00 |
|
Jack He
|
272eedba22
|
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a am: 55da62f36e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: Ie406b8c9f37091934ad1641524ec40492b654113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:16:45 +00:00 |
|
Treehugger Robot
|
9bd8bec2df
|
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I5314d3f9e5201402a377cf7e61e36994a933f5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-10 23:16:36 +00:00 |
|