Commit Graph

103921 Commits

Author SHA1 Message Date
Bill Yi
72d01bba8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: 8e72e0eff1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221

Change-Id: I4eb18bd9e45d24f23e1a50e45b74f0daf66667b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:37:26 +00:00
Bill Yi
e7804305be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219

Change-Id: Ic671f54fd9be8f81e060a8f80924c6730c500bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:30:31 +00:00
Bill Yi
163282414d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66baefeaed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219

Change-Id: Ic8947c54e73fbe56967ae9f1db2102ca8c182704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:29:59 +00:00
Bill Yi
8e72e0eff1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221

Change-Id: Ib1ce59307919b68c2fc6134223c3b15352038143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:17:20 +00:00
Bill Yi
72642fa03d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221

Change-Id: I54834357925f5ceac577f25ac97c56716e996a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:09:30 +00:00
Bill Yi
daacf9d045 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-19 00:41:39 +00:00
Kate Montgomery
2dc9ab9f81 Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: 499e8848bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I1f54e8636ef86efba28ce75fc2bdd3782378b107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:47:27 +00:00
Kate Montgomery
196d99198d Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c92780ceba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: Ib62a884b76001e15b2f5b5e6b0b5f507a0aefb76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:44:44 +00:00
TreeHugger Robot
b4f8df82a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 1f16b93bfb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: I744e6853aeb0800b0351dc563bc5427f1df9fc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:03 +00:00
Bill Yi
d81baee6ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours am: ccf14d5a76 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: I92e241fc512cb5dd9fea6079e361b3306908033f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:42:52 +00:00
Kate Montgomery
c92780ceba Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I01a58ec1e7f17ea67664515cfb610c937aae2d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:11 +00:00
TreeHugger Robot
f29047c284 Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb am: d9fa9f7ba1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662

Change-Id: I89847faca839a8da8f9f38a4d1ef4c1908987b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:11 +00:00
TreeHugger Robot
4dfa092886 Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 33622a034e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: I41a5656ba554ccedbd32f858ad57625a694a66d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:04 +00:00
TreeHugger Robot
c6451d4def Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83 am: d2631c30f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091

Change-Id: I721523de9b9c9db60971d010fc9510cbc5f455a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:40:57 +00:00
Bill Yi
d84e849f2d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64 -s ours am: 06e4b3d06e -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: I7b682c99f6652ae99dd872c0eaf5e5f27163b3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:40:36 +00:00
Arc Wang
c443587bc2 [automerger skipped] Center apps Preference title when there is no summary am: 3cb8171f4f am: 75eac09a00 -s ours
am skip reason: Merged-In I6fceba243e2ccac9ea180b940b571da07e1ba805 with SHA-1 3cb8171f4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345

Change-Id: I3825c5f8d7e186542a468f75440e0cd3d52f9e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:40:30 +00:00
Chaohui Wang
012573573e Fix flicker in Location page when location is off am: f9ebeadb33 am: 01431d5ffe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: Ica3337a8de89069cfe695db63f4afe46b61f1860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:40:22 +00:00
Hugh Chen
710bc7d66e [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: d217f66380 -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: I34aeeb75b2251ad3ac79d21e79041e2d4ce41812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:40:15 +00:00
Hugh Chen
825c6dfa45 [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: 978ba3a85d -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: Ie4e9ed77b7ae59753ae3510d4f2bcfcd74590d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:40:07 +00:00
Hugh Chen
cedf84a84c [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: 1b0e924968 -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: Iffb22c39733e9382e1ee7e7f0be2d667b222368b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:39:58 +00:00
Kate Montgomery
499e8848bc Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I52df4e0f5faef88f18e0e3cb1ba8bf4572fb2226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:47 +00:00
TreeHugger Robot
2e39615795 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 9db1451fc5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: Ib1d6bad93d911bd99aa14604cd6080fd1fa5772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:35:34 +00:00
Bill Yi
cedf54a680 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours am: c94186ccf4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: Iab728948e36b9952293150b793e34911d303fe71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:35:22 +00:00
TreeHugger Robot
1f16b93bfb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: I160b660c1eafe596a3661d1b720e175a4db24d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:27:13 +00:00
Bill Yi
ccf14d5a76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: If5e3fa82b7fd7fb4db5d7e803d13eb88dafd74cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:27:03 +00:00
TreeHugger Robot
9db1451fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: I868423dfaa7692cd532435fa7466d79d2877b6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:24:47 +00:00
Bill Yi
c94186ccf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425268

Change-Id: I49bc5b53380ec7429ac82d324ba52f48586a4bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:24:34 +00:00
Tom Hsu
fcb8ce86f0 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564 am: 6a85746757
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I3823d09d9e6880a13fba511b539652e6d049393c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:11:21 +00:00
TreeHugger Robot
b7ac6d6b36 [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: cfcad71f14 -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: I9c5bfb381e5c804fe51d0d122c70d60acbca6c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:10:28 +00:00
Hugh Chen
74ec56294f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 663066691e -s ours am: e178179a9e -s ours am: 97299b8c00 -s ours am: 66f147b21f -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: Ideb65f0c242845a94bf171c1cb4efcc0a384349e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:10:27 +00:00
Hugh Chen
a11bab21ba [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: ccf1ae76aa -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: Iaeb6490dc0c3faf307c84e8ebbc77e3a982fcc7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:01:09 +00:00
TreeHugger Robot
d1ae5ca81c [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-v2-dev am: c8603dabf2 -s ours am: 04cc0c8073 -s ours am: 166900f537 -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: Ieaa0ac95177e2f3161f495acafa3d2fd373040d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:58:14 +00:00
Hugh Chen
8f56361635 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 8bae222489 -s ours am: 6774dbbe03 -s ours am: ad2004b17a -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: I6b068e471deb1687d48f3efbd5945b79a9877d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:58:13 +00:00
TreeHugger Robot
d9fa9f7ba1 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: Iaea4f2e5c760cffb82b97c35e6dca719a9b418d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:53:31 +00:00
TreeHugger Robot
33622a034e 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: I6f935808fd9d0e4344016fbcc898d8e1df9daeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:53:13 +00:00
TreeHugger Robot
d2631c30f2 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: I32cc56aa67226fb62c0d4e01ba3c938529a7f063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:52:57 +00:00
Bill Yi
06e4b3d06e [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: I8f316c45e46901b6630525be8a202bfc061a388c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:52:34 +00:00
Arc Wang
75eac09a00 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: I6c0ade1ff22d4cd86ad2b850477c838ac87d0bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:52:29 +00:00
Chaohui Wang
01431d5ffe 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: I01d95d9378a22bcb2c9967baf3cb7698ef9f4452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:13 +00:00
Hugh Chen
d217f66380 [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: I03b41436fc4f1d9e12642a4336de37d5e5050c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:02 +00:00
Hugh Chen
978ba3a85d [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: I9c8a28dcd339ab1baf658d3c93023b6b16bcdede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:38 +00:00
Hugh Chen
1b0e924968 [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: I73706a8afaba4c4793e946d0d35b64fda17587c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:26 +00:00
Tom Hsu
6a85746757 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: I1a4398642952106003e6bfd64f4a8d96e1c38c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:50:14 +00:00
TreeHugger Robot
86720818ed Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb am: 3d05ca096b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662

Change-Id: Ic1783d17970ad8a2a4d36b41cf3667b76712f951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:38:51 +00:00
TreeHugger Robot
c62527575c Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 8d1ebcf00f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: I2f4917afc67f53ccc564f04a54894c2adc0bc791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:38:45 +00:00
TreeHugger Robot
f5360f698e Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83 am: e4fa9114bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091

Change-Id: I6c4aefd1f0798c397c3d8bbd694d5f3ea574ee58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:38:38 +00:00
Bill Yi
ac316980df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64 -s ours am: 6a1ff0e2e3 -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: Ieb2de454fd735c74cc1fa5882f3c3ec4b0cb672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:38:31 +00:00
Arc Wang
6d64ce7012 Center apps Preference title when there is no summary am: 3cb8171f4f am: 0dc879dbe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426345

Change-Id: I8df031b6043efe7aacecd1bde3baeb08de101468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:36:51 +00:00
Chaohui Wang
6f3e2dfbc3 Fix flicker in Location page when location is off am: f9ebeadb33 am: 2e7fc47291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I8aa2b85930042eba3fef5753cbaa0b66909cce6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:36:29 +00:00
Hugh Chen
29e5a6d834 [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: 304a83732f -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: If293d92dc62fa804f28a526e65e9881989e0a3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:35:45 +00:00