TreeHugger Robot
2a758498e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours am: cc7d18bd75
-s ours am: 1dd5c06a0b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I72a32d17882ab9bd903cc63ad6cb2ddbd18e383d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:58:37 +00:00
Bill Yi
5805ddda60
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours am: d425079d95
-s ours am: 81edec4bda
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Ic675ab9b1e6bbfe2888ab9d74bb06baf9a5d26c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:58:22 +00:00
Bill Yi
7f7f4d6f38
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours am: 0f52443ebb
-s ours am: 633d46e399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I6ff17895f6b010cc835361adb7e6d140b0f24db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:58:05 +00:00
TreeHugger Robot
1dd5c06a0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours am: cc7d18bd75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I655b0105e8c8da4a3c2ca6669ecd46eb73a1679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:53 +00:00
Bill Yi
81edec4bda
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours am: d425079d95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: If993a97d2e77df725736eb3542f0ddb6921f8c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:38 +00:00
Bill Yi
633d46e399
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours am: 0f52443ebb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I96925bc0e420f259b95363f8f3fc2969fbfb576d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:22 +00:00
TreeHugger Robot
6f1d70a7b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Ia663b76f3371691c0e43e49f43e293069ba7822c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:20 +00:00
Bill Yi
0dfd96e976
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I35197080d628e6ef4bfeb3ae8535eb7e9dcfaeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:45:06 +00:00
Bill Yi
ad24a2815a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: I61cf06d1e8f06e3c018231e8d809068353f8c026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:44:48 +00:00
TreeHugger Robot
3d05ca096b
Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662
Change-Id: I7adb7b5d835d196b1270d6362c6b92c99cc98bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:23:20 +00:00
TreeHugger Robot
8d1ebcf00f
Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101
Change-Id: I6d960bd4e85173dd967b7dba32c368e4313fc55e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:23:12 +00:00
TreeHugger Robot
e4fa9114bd
Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091
Change-Id: Idffc6b3474be43172173e156f64e29adee2a8d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:23:03 +00:00
Bill Yi
6a1ff0e2e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18446092
Change-Id: Iaf273e1da77be03004106004204a370055fb55ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:22:45 +00:00
Arc Wang
0dc879dbe0
Center apps Preference title when there is no summary am: 3cb8171f4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345
Change-Id: I97bc32891465de1a07aa2c6e5f87d00cba91cd54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:22:39 +00:00
Chaohui Wang
2e7fc47291
Fix flicker in Location page when location is off am: f9ebeadb33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153
Change-Id: I7588cce67c38bcd041af5f8842a586fa2877f800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:22:22 +00:00
Hugh Chen
304a83732f
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc
am: c2bb599eeb
-s ours am: 8ddd1d70b2
-s ours am: 22ce749aa6
-s ours am: 8ce854af29
-s ours am: 136af4e593
-s ours am: 40ed71c895
-s ours am: c4899bf019
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I98dd711ad750e2bb47431d399de2262e1fff306e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:22:16 +00:00
Hugh Chen
0f0a5b8574
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73
am: d925f52768
-s ours am: 8d4a4b690f
-s ours am: f13ceb8aea
-s ours am: ddc8e16cd6
-s ours am: 0e568376a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: I0087e50a2c492743e2a005b4d07cf3adee0f65cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:22:08 +00:00
Hugh Chen
e8a337b88f
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7
-s ours am: 1e636ad03e
-s ours am: dc1023e587
-s ours am: 3d0db8d34f
-s ours am: e5d54e867c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691
Change-Id: Id2b34acdd7b5fb34f8fd7d98e1821c1bb59fca81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:22:02 +00:00
Tom Hsu
434716f02d
Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600
Change-Id: Ic8be8651788252950cfb83c6bfa9183cac773d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:21:56 +00:00
TreeHugger Robot
51b6e0d7b8
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117
-s ours am: e26317b97c
-s ours am: ce98ad58a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689
Change-Id: If0980220837a81bae78ef56539d8d5d5a289113f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:21:46 +00:00
Hugh Chen
f595f98420
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e
-s ours am: e178179a9e
-s ours am: 97299b8c00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330689
Change-Id: Id8b26c51cb42667da391193096da4c1be0cbcd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:21:44 +00:00
Hugh Chen
e96661a12f
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 23ab123ba7
-s ours am: a2d6c9a087
-s ours am: eab5e61360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: I0aa103f52ec6f5eca1c8fc1f48b8d00150086a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:21:38 +00:00
TreeHugger Robot
4ea2a256f2
[automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2
-s ours am: 04cc0c8073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: If8eda405b10c7a402bba646ad6bbc328ae8a5113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:21:30 +00:00
Hugh Chen
fee801f2d7
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489
-s ours am: 6774dbbe03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330688
Change-Id: Iaf59321a4db2eb37de53d08ea50f9a2d584e1b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:21:29 +00:00
TreeHugger Robot
cc7d18bd75
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511
-s ours am: 7ab31e744a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: Ie645e9ed2f3b8a84f63bd2f066ff3ccb3656950a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:20:32 +00:00
Bill Yi
d425079d95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042
-s ours am: 900e78b59d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397897
Change-Id: I891e7c48b1750ae8ae3313c46c995fb80763ad1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:20:19 +00:00
Bill Yi
0f52443ebb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8
-s ours am: 66ad02c375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18397896
Change-Id: Iaae6f1a7be5ef43b552088d1506d367d1c94345d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:20:00 +00:00
Kate Montgomery
d79959bd7d
Merge "Flag off stickiness of show/hide system setting." into tm-dev
2022-05-18 19:21:45 +00:00
Bill Yi
dacb214506
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80b7dc4eb1
-s ours am: 860d1ab731
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425270
Change-Id: I29e22521b2aa9b58e0de1ec8271ffcd416ee8deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 17:47:33 +00:00
Bill Yi
792b06992c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac5ba6b7cb
-s ours am: 5adfbcdc24
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425270
Change-Id: I44721d6e9e08b608ba0122b20d4735394f5b49ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 17:47:22 +00:00
Bill Yi
860d1ab731
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80b7dc4eb1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425270
Change-Id: I116c6c735a84b6a573378e69e076ee2a5e8e4937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 17:39:42 +00:00
Bill Yi
5adfbcdc24
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac5ba6b7cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425270
Change-Id: Ieb66e097e111e7c5555cd2da588986ae3efab730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 17:39:15 +00:00
Bill Yi
80b7dc4eb1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-18 17:20:23 +00:00
TreeHugger Robot
c41e921e1c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-18 14:56:12 +00:00
TreeHugger Robot
6993aa86eb
Merge "Update Spatial audio settings page" into tm-dev
2022-05-18 14:43:08 +00:00
TreeHugger Robot
cce3381ed4
Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev
2022-05-18 13:47:47 +00:00
Zoey Chen
083c13d3f0
[Le Audio] Add test case for the QrCodeScanModeActivity
...
Bug: 232365943
Test: atest QrCodeScanModeActivityTest
Change-Id: I38db5957ff21608134aed2e26cd9c32f14b78eb9
2022-05-18 19:26:07 +08:00
Calvin Pan
1a253baae4
Avoid getting app locale config for each app
...
Getting app locale config will spend a lot of time. Removing the log
to prevent getting locale-config for each system app.
Bug: 232557302
Test: Saving about 80% under java stack tracing mode
Change-Id: I2e755286a4e493be7fd73028ade8d190f6571e46
2022-05-18 11:15:46 +00:00
TreeHugger Robot
1cf78b8b83
Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev
2022-05-18 10:09:46 +00:00
Alan Huang
bb3f56fc02
Update Spatial audio settings page
...
Bug: 229048602
Test: local build and verify page
Change-Id: I096eae1bd0ca3acd52e6025963a08b0d60cb8d74
2022-05-18 09:21:01 +00:00
Jason Chiu
65d46ee179
Guard against the NPE in setPreferenceIcon()
...
Fix: 232902867
Test: robotest
Change-Id: I01f2a6aa8dab9c8e099588e440fc35ed1093592a
2022-05-18 17:07:26 +08:00
Yi-Ling Chuang
b64d3589c1
Guard against the NPE in getTransitionType()
...
Bug: 232852095
Test: Go to fingerprint enrolling page and see the transition stays the
same(sliding) after this change.
Change-Id: I259eb4362b273f6b297e94d59d6720a9d6bf6373
2022-05-18 16:53:37 +08:00
ykhung
eadeee54bb
Fix incorrect battery icon showing on the recent apps
...
Bug: 232204674
Test: manual
Change-Id: I169a59a2cbdd5f20266235b5c70bd524f08ad454
2022-05-18 12:18:15 +08:00
Bill Lin
00d9f3a666
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
am: ab47efa4f9
am: 012b4dd530
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: I2943f9270cb8063c4a4160d4d78321375faf84cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:51:06 +00:00
Bill Lin
1b253beed0
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
am: c4492becef
am: 69ce6cadcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: Ic954dc4066bb6d565f0571bffdf1893fa0a219c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:50:28 +00:00
Bill Lin
012b4dd530
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
am: ab47efa4f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: Ia1942dc5fe70a98b6c43ff16fe163e7c2e0a026b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:31:28 +00:00
Bill Lin
69ce6cadcd
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
am: c4492becef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: I987d4c6a4c71515e8040f4a2773bd74935103130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:31:03 +00:00
Arc Wang
961a40d5e3
Merge "Center apps Preference title when there is no summary"
2022-05-18 02:09:25 +00:00
Bill Lin
ab47efa4f9
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: Iadac0b4aa55b86354503798b3027a26596b5ef67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:04:57 +00:00
Bill Lin
c4492becef
Merge "Update biometric_settings_hand_back_to_guardian by device type" into tm-d1-dev am: 3db69adf01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281783
Change-Id: I48390a1462c42d2676f8d740f1bc7a8c05613c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 02:04:55 +00:00