Bill Yi
82148a40ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42f13be21657749f18b7e808ca1f6a008a38cf26
2022-09-21 17:14:58 -07:00
TreeHugger Robot
e0bbfab81c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: ac3b26c186 -s ours am: 870f086d09 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Idfa4618a147b8be9082d6a4452d18abc98d80e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:51:29 +00:00
Bill Yi
2c38b1f17f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: f6a5f7a782 -s ours am: 6f94dadf41 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I54003727fd86a627b095bdb394deef757d279ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:51:15 +00:00
Bill Yi
24d5554efb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours am: b894f205e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I707b6db35af3c6ea0f209d5886fc265dd26b9fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:50:58 +00:00
TreeHugger Robot
84984cfb16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours am: a823e92625 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I015425941faa998c3d5e4379f5b862a380a18cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:30 +00:00
Bill Yi
10de28b502
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours am: bf1d22276a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I06f51912aa076a393b7d0dec0c5661ce31691ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:23 +00:00
TreeHugger Robot
2cb99dadc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours am: e3b73b4216 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I2f8488ca2488721de68a57f9998dc3b6b806d4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:16 +00:00
Bill Yi
de925e65b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours am: 329b7e6713 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: Ie0bf2a18897b7b3e78b169ae9cf7d1606b7c5648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:07 +00:00
Daniel Sandler
ba81fe61cf
Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711
Change-Id: I794c118911d6d2fa47ff9190a6108fc1e3d0f11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:22:53 +00:00
Automerger Merge Worker
fdd2f017cb
Merge changes from topic "am-783809c7ca4b483db6c95715ef64a24f" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6323d7fa3028849c71d385c3d8f340b5d5b545e3ddd993363806a44c6afa3f15ab25c5b5d07821c08
2022-09-21 22:49:51 +00:00
TreeHugger Robot
4c9ca7563f
Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev am: 581fd171b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997086
Change-Id: If131776cab08c56c05b3e418c06730f63a21be59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:49:38 +00:00
TreeHugger Robot
61000bd01b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: 323d7fa302 -s ours am: 8849c71d38 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Icee67644111f7e555d8986d5caa1a2e6f947b74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:49:28 +00:00
Bill Yi
ee31dd47de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: 5d5b545e3d -s ours am: dd99336380 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I851f525e22b7403f2b4fe1825a106e9b4980b8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:49:12 +00:00
Bill Yi
3393a72c45
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: f15ab25c5b -s ours am: 5d07821c08 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Ia338828e654f000786728a008149866bc8c7a991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:48:59 +00:00
TreeHugger Robot
bec5cc54fa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: ac3b26c186 -s ours am: 79dbc576ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I992a3c46095176606d23de270db0c74bb287836f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:35:30 +00:00
Bill Yi
1eff6c2155
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: f6a5f7a782 -s ours am: 3e363c0549 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I381e6022fb542857b56523f96b37a46b3a4336ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:35:15 +00:00
Bill Yi
c35d911038
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours am: c2faa5ccc6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I840143c3a5fcf005fd8dd54a8bdc971324679de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:35:02 +00:00
TreeHugger Robot
8849c71d38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: 323d7fa302 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ic0ff3c28c3c810ee4a2b026ddaaea3c582303591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:27:13 +00:00
Bill Yi
dd99336380
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: 5d5b545e3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Id2519e8ee136982781b6900db4e51750a0867364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:56 +00:00
TreeHugger Robot
25e883d9fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours am: ac92abd818 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: If6e7c9b7a11512c20acde0eb72178bb32992d5aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:47 +00:00
Bill Yi
5d07821c08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: f15ab25c5b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I141e9f19a823a7dc5acb56aea963f613e571f39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:44 +00:00
Bill Yi
48cbbe67a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours am: ac8e5a5efd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: Ic73fc02d563d54fe5021a33891f89103c86aec89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:42 +00:00
TreeHugger Robot
0f05dd22b4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours am: e0e3ca6646 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I8f12e85c006d849bd7a8ffc0e4addc57d73f6735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:30 +00:00
Bill Yi
507a7d4c0c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours am: d86bb6ee9f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I828c752de1880ea14e0eb563163cd126959dd448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:22 +00:00
TreeHugger Robot
870f086d09
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: ac3b26c186 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ic2e99b4174e65731af5f04c0e8f7649066c942e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:25:11 +00:00
Bill Yi
6f94dadf41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: f6a5f7a782 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Icedd9ba5f02efee07572f4eac8ca049f51fc662e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:24:55 +00:00
Bill Yi
b894f205e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Id7281acfa8ade5b7caac68909ea535328e9786cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:24:44 +00:00
TreeHugger Robot
9a4844c2a9
Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev am: 53f1e23d63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949396
Change-Id: Id8871a6434f46e39f9814490c6cb85eb9529d50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:22:16 +00:00
Binyi Wu
b2aa91a331
Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev am: effd45b308
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19852695
Change-Id: I682ca9613cd67d56d1a6b8882b986abe15f140b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:20:43 +00:00
TreeHugger Robot
79dbc576ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: ac3b26c186 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I7658bd07de80149507d170281bad250b7654539c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:47:13 +00:00
Bill Yi
3e363c0549
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: f6a5f7a782 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I2ef6f1ef7674f64d7f239f7424f68423f846ff38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:46:57 +00:00
Bill Yi
c2faa5ccc6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I6b2953e71ef984f008f2fc2762d5fe3804f6b702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:46:41 +00:00
Bill Yi
f50089ff29
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 198cb56664 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998246
Change-Id: I594d9d0cc861b7774b4afe32a5f3586fa465172a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:42:44 +00:00
Bill Yi
b932690ae7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c3126868 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998246
Change-Id: Ie7a769015229ca99524253c2d8cacef3b94c652e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:42:22 +00:00
TreeHugger Robot
ac3b26c186
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Idfa7dec8282c603577c87c8be95953270eb34ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:34:28 +00:00
Bill Yi
f6a5f7a782
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I90e4740ba9156827905152924cd4e16c837043d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:34:11 +00:00
Bill Yi
9cc6bc637f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: If23cbcb75bb7c7101a7a40943082b78c90d0ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:57 +00:00
TreeHugger Robot
a823e92625
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: Ic0468d609842281b98f23cd8db0f1f0e9761b165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:30 +00:00
Bill Yi
bf1d22276a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I0648190f397d4ba1e9a1f33d9fc8c6b1d5adeb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:23 +00:00
TreeHugger Robot
e3b73b4216
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I53be2e833a209ba5eb2885b9380d418c09a32fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:13 +00:00
TreeHugger Robot
ac92abd818
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I37b11ce456cd9165250295ac7052be3edc13b868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:08 +00:00
Bill Yi
329b7e6713
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I194faae9929afb413f0791be155bf7b5d02dbc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:06 +00:00
Bill Yi
ac8e5a5efd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: If53f0cbd33af90bac023c46636cc1e705e9a33bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:00 +00:00
TreeHugger Robot
e0e3ca6646
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I200fba460875d49b6864e06de995d910e0315671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:51 +00:00
Bill Yi
d86bb6ee9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: Ie276d18775fac66211a1a7f2f7445324aa3fb923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:41 +00:00
TreeHugger Robot
323d7fa302
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ia7c89c65eb9c4a92614e9c8d071c9ca0dbe5a988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:00 +00:00
Bill Yi
5d5b545e3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I930d2dca18728294d91ce946055de46c228c1412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:30:46 +00:00
Bill Yi
f15ab25c5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Ieef58eb9ebb601a187194d713d60d4097e0a3948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:30:22 +00:00
Gil Cukierman
4429054bb1
Use AAPT2 For SettingsUnitTests
...
Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.
Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00
2022-09-21 17:48:20 +00:00
jasonwshsu
35e20d5ace
Fix not on the top when entering device detail page
...
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.
Solution: That SpacePreference should only be visible when the device is
hearing aid.
Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Merged-In: Ic0be940c8466b5e1e301255868c29d06bd4428bd
Merged-In: I442445a861898258a73f37ad8f85bcee387fbf58
Change-Id: Icca48d9c2643507638b2b581d052530521cce5df
2022-09-21 23:54:15 +08:00
