PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,157 Commits 1 Branch 0 Tags
1f76047c99b07b124667da298f686461dc09474f
Commit Graph

124157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
1f76047c99 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 am: d014b55e01 am: 26065748b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: Id1c4025852066bd6583fbd055e0e304db389ffe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:10 +00:00
Zoey Chen
2cf6609f83 Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: 221a58918c am: 017f916957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: If7bec6e2d9a446377e2aebbe54e283cc6f6ec480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:00 +00:00
Treehugger Robot
d10aadc416 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826 am: 9b25f5ac88 am: 14cd4ca61a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: I2b2b87df99fa9c7cd200acf0aaae86f3b1a6ef9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:44:47 +00:00
Zaiyue Xue
7f03e36e39 Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5 am: 796c2ef5ca am: ac87cc3cf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776

Change-Id: I86e40165d4c9026f682148f480627d984d018da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:43:46 +00:00
Zaiyue Xue
bab85fc2cc Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 am: 8892fd48ca am: d71ead4afb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: If360a01ca1d8c636c8cfd49124fbf19cc62538f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:43:34 +00:00
Zoey Chen
91f1d9642d Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 am: c28a5c3431 am: ea0f1b4bc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: Id077ddc17bafa2c0bfa8a64c72c7295239a4b7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:42:20 +00:00
Zoey Chen
b6af21adfa Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: 609b91c715 am: ca01227cbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: I9ca9bbf8f966832942ec1a0108ba8f934c862dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:41:22 +00:00
Lin Yuan
f94aae1766 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 42188dcd5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I64705175f3a4ff791baf2cece3b528f24814bc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:24:56 +00:00
Treehugger Robot
be3f127d91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: a937eb6cfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9885d6779e156715f0c26e6199ecfa4451a4fcee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:17:41 +00:00
Lin Yuan
42188dcd5f Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: Id62429c88143a63acba005d035d4c4d2699e26f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:36:28 +00:00
Lin Yuan
0bb504c42c Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev 2023-04-25 19:31:35 +00:00
Treehugger Robot
a937eb6cfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a0245aced46e867e7de680ef15dde00fc6d3e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:29:20 +00:00
Treehugger Robot
3747961aaf Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: ed9f22b78a am: 5f160e1562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Ib32605bc57d46f94d98a58b2e077687475e872f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:38:09 +00:00
Bill Yi
5d77d702cf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 0a2936d879 -s ours am: 37fab052e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic46a93e21054d71f41c8d781dd3255412af49dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:37:32 +00:00
Treehugger Robot
51b5a14dc8 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: b0bcad3210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: Ib5acbdb5714516048b9bc687900dba997d0167e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:49 +00:00
Bill Yi
62f0a5d938 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 9bd3a732d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ace9cae4ddd13aeafdb614a2c22d1b311abbd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:10 +00:00
Treehugger Robot
c7f8ae5369 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5c9a7f04b6701169c45039cd955bd356a86a240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:07 +00:00
Treehugger Robot
b0bcad3210 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I8316fb47446cf5308f2e5c8c3b4a3efc596fe5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:54:42 +00:00
Bill Yi
9bd3a732d2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9768cf0e3ebbf17204c29158d2cbc11f49bea3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:54:18 +00:00
Treehugger Robot
073e21ffeb Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: 26adf38f78 am: 4c78f9cdf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I918a7c552551d9866d7e9964f45699edcbb7b1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:51:26 +00:00
Automerger Merge Worker
21e0d3f4d0 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours" into udc-dev-plus-aosp am: 5e3e804b39 -s ours am: 294c5a72bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d4bf0d929d72fcc5f28d9a4520a03c053759d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:50:50 +00:00
Bill Yi
b1517e13df [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 27bc142960 -s ours am: 4d378ddc21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I056b748d01f6a955d583676344fef9fb8e1919b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:50:39 +00:00
Fangqiu Su
13fdff36ea Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e am: 6b6044bedb am: 0f1ca5b569 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ie741b7c5244982a85336078ceccc606c25fea519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:49:58 +00:00
Chaohui Wang
d5b178870a Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 5fba57460c am: cf47befb50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I12f25e4b54db4f250f5c87c737ef7aac23ac2139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:49:43 +00:00
Treehugger Robot
e26112e56e Merge changes from topic "tc_change_23042206_48" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-25 17:49:42 +00:00
Treehugger Robot
32873d192b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-25 17:49:42 +00:00
Treehugger Robot
7192683db1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 646e95241d -s ours am: c55501f7c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id72527423e81e076045dcbcc7feded9ea75dd900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:32 +00:00
Bill Yi
59f12fef8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4b01e8c9 -s ours am: 9a68370305 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia05ce5fccc6302f805ac72ca3bb4d08772efa168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:29 +00:00
Treehugger Robot
cb50d56ca0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 103dfefdad -s ours am: d704607b35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05f554e5dee898b5ee8ee25bc72cdd4b82e13b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:19 +00:00
Bill Yi
c5e2788132 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c43541f1c -s ours am: cacff81257 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb5a6d2fcb7b4d8227b90e7541981d870f9bdcb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:07 +00:00
Treehugger Robot
f879b8ed8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 29ba678514 -s ours am: 9baf7e3fca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ccee8638b16b9dff0c54e04ff0bcc31504734cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:47:37 +00:00
Bill Yi
eee99582a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f92177ec1 -s ours am: 1920f8aa93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61d24bf6df10bac54d0bc8d32ca02a34bc4f4df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:47:06 +00:00
Treehugger Robot
a4ef2cdfcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: ee690ca0eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia404e46fb999a3963c2a25fb6f5ff92e0826d3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:43:53 +00:00
Bill Yi
9d260b5cc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: a3dc766061 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I350192aeb65c966e1b72bb79a8eee5d70e641ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:43:18 +00:00
Chaohui Wang
050cc72bfe Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 7823686740 am: 6ec804e4eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I50119040f7742a87122002745414ff1ccc2da02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:41:35 +00:00
Bill Yi
37c644a257 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: ae326b5f83 -s ours am: 92afd34258 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae22be87782e14ade805be087ad2174c2ba32e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:24 +00:00
Bill Yi
10d724441d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: fc348ab76d -s ours am: e0e2df5e16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb68da295d8ff681f21990c13b80c46645157317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:21 +00:00
Bill Yi
6f0a72f5e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: 733d6f5579 -s ours am: a90458fe71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a5c082f9b4c54ad9a1e8f08619ff798dbf48237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:19 +00:00
Bill Yi
46595042f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: f477d02f91 -s ours am: eb791b09dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59d60a43e63eff62d313bc42063da4668a05bcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:16 +00:00
Bill Yi
47321ef8a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: e676a561d8 -s ours am: fe774bfa67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e2f5203906dfeed8d9ef58ede6d58a06ded236c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:09 +00:00
Bill Yi
291585cfa9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: f537b87b7a -s ours am: 41fa42fc6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c0ed6c267f34591093c8f7457b61a3914d74a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:39:27 +00:00
Treehugger Robot
ee690ca0eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3992f2d338e853b677aa14b2ecb26b73212d4b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:28:35 +00:00
Bill Yi
a3dc766061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49b02e2e25891f61a4ec93986e33a5097eb3250f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:28:12 +00:00
Treehugger Robot
6a0935a34f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11af2e25300a6dc5f106b694ffb2fc5a558c52c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:06:44 +00:00
Bill Yi
ffe604c85c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice851b6bd9aed5f50ea95b4ab778793eff02b3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:05:38 +00:00
Treehugger Robot
05067bd2e1 Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 5e53a4aa56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: I1c4c0a0805b9f74fdb57de4f242dc7722dd67d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 16:36:48 +00:00
YK Hung
c2474363a7 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 am: 4fb520d99a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: Ie87d989de63a331c6a5e278a983cffae9ad23594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 16:35:05 +00:00
Lin Yuan
f57e52a64d Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
 2023-04-25 12:30:03 -04:00
Treehugger Robot
33837c6766 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-25 16:17:03 +00:00
Treehugger Robot
5e53a4aa56 Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: Ic63e1482911f219cbf711ce166089bf887b7e40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 15:44:26 +00:00