Commit Graph

121131 Commits

Author SHA1 Message Date
Bill Yi
e5e9d6ec2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours am: e0c151f401 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00caeabbc091d5e00a27b136328e6e4b64e17f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:36:40 +00:00
Bill Yi
a336abaeaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours am: f58ee3f5f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie888fa2400dfb751d6ca0aff6d0de36b20ee967f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:36:29 +00:00
Bill Yi
e0c151f401 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours am: 3fd3c68bc9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b12e6d6f54498621874e018c19da0b3c904a9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:05:23 +00:00
Bill Yi
f58ee3f5f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours am: b9446778d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6d39000e5fde2309e4a82483db0da9584311747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:03:22 +00:00
William Loh
baa16cfefc Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22212986

Change-Id: I98c3e99a3b2b769bfb7bfa6248601702bed3aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:00:44 +00:00
William Loh
6e5e43829b Merge "Keep same behavior after initiatingPackageName change" into udc-dev 2023-03-23 18:42:04 +00:00
Ioana Alexandru
164ef2bc06 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I10ddb90f41cbaf022d5d90777477c44b6cff03a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:38:52 +00:00
Bill Yi
3fd3c68bc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d1957fbd821e1f1201999f26d700a6c05ed26c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:33:40 +00:00
Bill Yi
b9446778d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia334891d08bd4618c11d3a94051d03011ae11b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:33:16 +00:00
Bill Yi
569ceb7d56 Merge changes from topic "tc_change_23032218_17" into udc-dev am: 8e1e45468b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22202160

Change-Id: I03f0efb892e763930fec4e4643d300bc355bc463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:05:35 +00:00
Bill Yi
c1bb86850a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de am: 2433e07070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1ca5a514bf969fbc43b8810cf2aa0d072d03e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:05:23 +00:00
Bill Yi
9850976bf3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-23 18:03:14 +00:00
Ioana Alexandru
f8662a4f40 Merge "Clarify notifications behavior in bypass setting." into udc-dev 2023-03-23 17:53:25 +00:00
Bill Yi
8e1e45468b Merge changes from topic "tc_change_23032218_17" into udc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de
  Import translations. DO NOT MERGE ANYWHERE
2023-03-23 17:46:19 +00:00
Daniel Norman
5441771b20 Merge "Update Settings animation to use new slide style when in SUW." into udc-dev am: c76b568914
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163924

Change-Id: I9daf33134aa090e74ee2d062b5b7649b3226489c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:42:40 +00:00
Becca Hughes
7b1a81e0a6 Merge "Add settings intent dialog" into udc-dev am: cbbab3632c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22181848

Change-Id: Ic3a96a9930c11a5420c0a8109171283fb5bde14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 17:40:15 +00:00
Daniel Norman
c76b568914 Merge "Update Settings animation to use new slide style when in SUW." into udc-dev 2023-03-23 17:17:20 +00:00
Becca Hughes
cbbab3632c Merge "Add settings intent dialog" into udc-dev 2023-03-23 17:07:56 +00:00
YK Hung
1db438deff Merge "Update battery settings page footer string" into udc-dev am: 72690c6844
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Iadb81f33606f807c60085e67429bfc04871d14b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 16:20:31 +00:00
YK Hung
72690c6844 Merge "Update battery settings page footer string" into udc-dev 2023-03-23 15:55:03 +00:00
Treehugger Robot
f6100cdfa5 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38 am: 0bf3e6c9a4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I322e4eb78cb294a62c0e53f3daf7dafc5a368e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 11:36:26 +00:00
Alexander Milantev
0e59c79809 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Iff5c7efa1738ec452ed9327ab3f738450a7c989d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 11:35:13 +00:00
Treehugger Robot
0bf3e6c9a4 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 am: ebfd790f38
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: Ib5248f616a93ecc8b734291e80fd2160288f2c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 10:53:54 +00:00
Alexander Milantev
cb227a79a2 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev 2023-03-23 10:44:28 +00:00
Treehugger Robot
ebfd790f38 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I2d16235171ced53fa97c8c0c826869267d6e25ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 10:15:59 +00:00
Treehugger Robot
7b4a3ada12 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: Idaedbac33bebafb96ee87fb4e396a88a41708e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:39:15 +00:00
Treehugger Robot
993f582fca Merge "Hide TTS search results if no TTS engine is available" 2023-03-23 09:02:49 +00:00
Wesley Wang
c81b12aabf Update battery settings page footer string
screenshot: https://screenshot.googleplex.com/4LdASHFSS23Q5NK.png

Bug: 274871896
Fix: 274871896
Test: make SettingsRoboTests
Change-Id: Ia739e5b004755a16fb80d460657bcffcb40404f9
2023-03-23 17:01:42 +08:00
Josh Hou
1d72f6d119 [automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours am: b3ed786e76 -s ours
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history

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

Change-Id: I136dd196b891963dc009925430dfb48a63455238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 07:10:48 +00:00
Tom Hsu
5d8121966d Merge "Remove Numbering System preference if no corresponding locale." into udc-dev am: db94f350cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122897

Change-Id: I143b9528f46e78192a3135e5cab2c69b7522874e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 07:10:05 +00:00
Josh Hou
b3ed786e76 [automerger skipped] Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549 am: 3a03857139 -s ours
am skip reason: Merged-In I4405b3b7e832b71b9ef66fa71d9e42ce12da167c with SHA-1 38df174bba is already in history

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

Change-Id: Ia690fd66cd5a944cc20b8523be6e3ac2f3cb03f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 07:07:16 +00:00
Tom Hsu
db94f350cb Merge "Remove Numbering System preference if no corresponding locale." into udc-dev 2023-03-23 06:41:37 +00:00
Josh Hou
3a03857139 Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev am: d06d826549
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173333

Change-Id: I3d91cd2c803357778718e7d70350aa73c4cec675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:28:32 +00:00
TreeHugger Robot
fe42f4f23e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 419d424c0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9236fc17deee5da4cb8c25cbab9edace8af6b1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:18:55 +00:00
Bill Yi
8f805f1682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4bf6f099aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73378d996d39b0f199b6812e35e5add7180de14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:18:52 +00:00
TreeHugger Robot
28a9480649 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b7c595c4de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cec6bb2f9e04f62813618260a65265ea0ea8c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:17:26 +00:00
Bill Yi
835e89de33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b11c37e6f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idad83f123d19d7ff8b89904cc12c06b5f31b2916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:17:19 +00:00
Jason Hsu
79e8878f3b Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev am: 0ef1b05630
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809666

Change-Id: I61ebc751de835c4a69c67a0561f4f8f0426e6011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 06:12:08 +00:00
TreeHugger Robot
8abdce5cba Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-23 05:56:21 +00:00
TreeHugger Robot
419d424c0b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-23 05:41:57 +00:00
Josh Hou
d06d826549 Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into tm-qpr-dev 2023-03-23 05:39:19 +00:00
TreeHugger Robot
b7c595c4de Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-23 05:37:26 +00:00
TreeHugger Robot
ae4a92d3a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-23 05:36:33 +00:00
TreeHugger Robot
fad707affb Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-23 05:28:39 +00:00
Jason Hsu
0ef1b05630 Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev 2023-03-23 05:18:56 +00:00
Etan Cohen
9a63d6571e Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev am: a7e606e406
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22156122

Change-Id: Ie9bd6fbc6da5cd69e86e6a91ed42450c941d8846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 04:59:35 +00:00
Etan Cohen
a7e606e406 Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev 2023-03-23 04:24:41 +00:00
Bill Yi
2433e07070 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: af01fb89de
Blank merge reason: commit message contains skip directive

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

Change-Id: Ida2c11b48dcccc96e2f3bbf836c9950a24dba71c
2023-03-23 02:02:14 +00:00
Zoey Chen
2d280165b4 Merge "[Settings] The receiver should be registered with all clients instead of the client which init the repository" into udc-dev am: 4940c2978a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22198542

Change-Id: I9cb7585012441f0fd2211531a2d5d4dcf7cc97fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 01:37:57 +00:00
TreeHugger Robot
0c0acf26eb Merge "Fixes AOSP crash when WPP isn't installed." into udc-dev am: 010ef319c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22187500

Change-Id: Ia012340418db0e6e83a180d44d8179f104023ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 01:37:04 +00:00