PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,689 Commits 1 Branch 0 Tags
1b02444dc85189b5057844be0d9a8b56e87bfdbc
Commit Graph

120689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diya Bera
eed71624c3 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab am: b0fb8ebc95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I5eb5c4df4bfa6fd98b607df89da8155261d7247d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:03:57 +00:00
Nikhil Kumar
68b7328ea5 Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae am: 4096329efa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124

Change-Id: I41189a6b367e6bbfe15b8cf5caa36c2cc1ad4794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:03:30 +00:00
YK Hung
80c44546cc Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88 am: edb878db1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109

Change-Id: I629f5d21c84324b8bf9f388c1ed1d0d7c69e45b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:03:04 +00:00
YK Hung
8d48c6802f Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0 am: fd3b8bc1dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009

Change-Id: I801fa9d066df4bba92d7ee846e29f65b00d72b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:02:37 +00:00
YK Hung
3ce2da64a6 Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev am: 405bea531a am: cc207d81a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537106

Change-Id: I21ebce2e7233e97315cd3ce5efcacf82b5d2c587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:02:19 +00:00
TreeHugger Robot
6cb9363b7b Merge "Cleaned up the deprecated APIs" into udc-dev am: 22a620dbd4 am: 3105ce9819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21528007

Change-Id: I85789a3f1aebe09a395f0e2885f024b5e7d12412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:26:13 +00:00
TreeHugger Robot
34a75bf63a Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269

Change-Id: Ide8718367cf66bc5a6cb5bdfa1f3a62e5677df71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:14:40 +00:00
Bill Yi
2ab0d2d710 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a am: 2f3719e7f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I439482d032687632e6d665f8831cf00ac2d80378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:14:21 +00:00
Jeff DeCew
987f406a2e Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c am: 05c43c2edc am: da1f2578a0 am: 2a269d9b76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805

Change-Id: I99fd42c960243d3199e5d5bbc88cfa4f4f07501f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:08:17 +00:00
Chaohui Wang
9bbdfeddc4 Merge "Update HomePageProvider to use getSettingsPage" into udc-dev am: 6461dc3814 am: 81aecc52a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489365

Change-Id: Ic72834777d8beb869fb53005c0cc3ce9719a85e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:07:41 +00:00
TreeHugger Robot
e6126b37d9 Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d am: 2ecd05add8 am: 408a4045f1 am: 156ef43064 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350

Change-Id: I3cc3e5c3039680316476b45d52b348d1f84645b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:58:57 +00:00
Diya Bera
b0fb8ebc95 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I18341d77c718d5ad5fb04ca488bd2f284c479e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:33:39 +00:00
Nikhil Kumar
4096329efa Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124

Change-Id: I69701d8d501c9207cc17c413519be2cad116cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:33:17 +00:00
Jiaming Liu
b523732b22 [automerger skipped] Fix build for jetpack update am: da7f685695 -s ours am: c0e3bdd218 -s ours am: addeccd855 -s ours am: 4fb46658b0 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c is already in history

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

Change-Id: I02a9238f2bbc4cc948eea3af1ca6871cfba8085d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:19:12 +00:00
Diego Vela
a2873471ea [automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a -s ours am: 798e242964 -s ours am: 542b1141c6 -s ours am: 42eb9e2878 -s ours 
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e is already in history

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

Change-Id: I29c8387bd51396b6ba4e4aa6b96cceae4ed0bae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 18:19:01 +00:00
Florian Mayer
9d99ab422a Disable MTE developer option if device config overrides it 
On the backend, the device config would already override the setting by
the UI.

(cherry picked from commit 65116faa29)

Bug: 269523554
Merged-In: Idd249e060a275b58a399349f202fc68b42964eb0
Change-Id: Idd249e060a275b58a399349f202fc68b42964eb0
 2023-02-23 17:58:33 +00:00
Florian Mayer
1d86531600 Merge "Disable MTE developer option if device config overrides it" 2023-02-23 17:57:59 +00:00
YK Hung
edb878db1b Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109

Change-Id: I3298a3ce189f806219b961c8c733621417309699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:55:20 +00:00
YK Hung
fd3b8bc1dd Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009

Change-Id: I7933641404c7cbeccc7d8057e66d8a9bd9cdb4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:55:03 +00:00
YK Hung
cc207d81a3 Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev am: 405bea531a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537106

Change-Id: Iedf3c9ba2fd5fbca72517d4287bf0a245ca64c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:54:47 +00:00
TreeHugger Robot
3105ce9819 Merge "Cleaned up the deprecated APIs" into udc-dev am: 22a620dbd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21528007

Change-Id: I819254885e6972c342d53eec9696a1fda876f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:54:26 +00:00
Jeff DeCew
2a269d9b76 Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c am: 05c43c2edc am: da1f2578a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805

Change-Id: I6cc344d50231606058bd7a45d18a7c50dfde8fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:53:43 +00:00
Chaohui Wang
81aecc52a5 Merge "Update HomePageProvider to use getSettingsPage" into udc-dev am: 6461dc3814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489365

Change-Id: I82ecba944d71423e68fa49c52bcfe2cfce1107e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:22:33 +00:00
TreeHugger Robot
156ef43064 Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d am: 2ecd05add8 am: 408a4045f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350

Change-Id: I40ea3e965313f192bb15dbc0407ae2216ea3b25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:22:14 +00:00
Jiaming Liu
4fb46658b0 [automerger skipped] Fix build for jetpack update am: da7f685695 -s ours am: c0e3bdd218 -s ours am: addeccd855 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c is already in history

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

Change-Id: I42b1ed20e4b1ca8313bf6863fd5c7ff9e6441021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:05:22 +00:00
Diego Vela
42eb9e2878 [automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a -s ours am: 798e242964 -s ours am: 542b1141c6 -s ours 
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e is already in history

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

Change-Id: I1a8e9f27d381e25939e7bb4a1f23884b8181b771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 17:05:10 +00:00
Daniel Huang
7b587ade21 Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: I0cc034d2300eed8fb08ca163dbcaea19fbde7e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 14:48:39 +00:00
Zaiyue Xue
ea5b49f799 Fix b/265364351: Light theme icons opacity is too light 
https://screenshot.googleplex.com/Avqsw3gb2tjKqrK.png
https://screenshot.googleplex.com/46AZuJMjp2HMyqd.png
https://screenshot.googleplex.com/9mE3XutRUNaGckg.png
https://screenshot.googleplex.com/5rNUKMJjhNBNShZ.png

Bug: 265364351
Fix: 265364351
Test: manual
Change-Id: I7521030f1a5d84cd88027fb84a465623610707fb
 2023-02-23 21:12:29 +08:00
Daniel Huang
6e6b067863 Merge "Change key name "Meta" to "Action key"" into udc-dev 2023-02-23 12:50:31 +00:00
Zaiyue Xue
750a832ffa Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I3c679a40080662260c7871a7ece88f607a7cbe9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 12:06:58 +00:00
Avinash Vadlamudi
670f1b2718 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: I7fcc3676caa7109a4893b438dcaff444bbec13e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 12:06:02 +00:00
Bonian Chen
550b5a0ba1 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I5c12ad23a240fbe70630855e5f98b5be83912674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 12:03:46 +00:00
Zaiyue Xue
2959831d59 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev 2023-02-23 11:46:58 +00:00
Avinash Vadlamudi
2a619718ee Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev 2023-02-23 11:33:41 +00:00
Bonian Chen
7d76797f94 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev 2023-02-23 11:04:19 +00:00
Bonian Chen
23ebc49810 Merge "[Settings] EID should be read out as phone number" into udc-dev am: 07d60877b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546836

Change-Id: Ief66867c4d65c1d7d15e7ee5156c4b0d31638ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 10:53:47 +00:00
Bonian Chen
07d60877b6 Merge "[Settings] EID should be read out as phone number" into udc-dev 2023-02-23 10:25:20 +00:00
danielwbhuang
b8e1799527 Change key name "Meta" to "Action key" 
1. In the modifier key remapping page, the string "Meta" should be changed to "Action"
2. We should add the default focus effect when users go into this page first time.

Demo: https://screencast.googleplex.com/cast/NTA2NjA2MzEyMjI2ODE2MHw2YjRjOTljMi0xMQ

Bug: 269981968
Test: manual
Change-Id: I481be0370166a8831bedc721751e23cee3b39703
 2023-02-23 18:01:15 +08:00
Anvesh Renikindi
ca7d226190 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Ib5945a08241be17df689932a7d7916e418147321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 09:10:56 +00:00
Anvesh Renikindi
a94e4cf2f0 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I3073249788c7243e7948344ca6d39f966262b1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 09:10:51 +00:00
Jiaming Liu
4c2ba829a9 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I2a15c3698c68fd6f995d08acb56ea4a514cafb5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 09:10:50 +00:00
William Escande
17a6f54b56 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I94a513c6fc45aed0922f0747da4856c42a5bcf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 09:09:02 +00:00
Bonian Chen
a9717482a7 [Settings] Customizable resource for hiding 3G preferred network type 
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.

Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local

Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
 2023-02-23 09:04:50 +00:00
Anvesh Renikindi
410fa6cfc5 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Ic35c8cd9e96390ae88eaea48ed8cdf44e08d911a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:48:54 +00:00
Anvesh Renikindi
445d0468a7 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: Ia9c438d4b53e6b14c33bd0d0bea43782d52f8ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:48:47 +00:00
Jiaming Liu
be5caf1230 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I0ad825c754b5940d80085d155ca425728998a828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:48:45 +00:00
William Escande
4df2d78817 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: Ied121b87732ecf6603441a61678be5f5c5f89829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:46:59 +00:00
Bonian Chen
ad209be4af [Settings] EID should be read out as phone number 
EID need to support TTS.

Bug: 270517566
Test: local

Change-Id: I630e94cca8d240595546897ac17ae6c59366c84a
 2023-02-23 08:45:25 +00:00
Charles Chen
159b42a247 Make Settings show in two-pane on portrait tablet 
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
 2023-02-23 08:38:52 +00:00
Anvesh Renikindi
bdd54472a8 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Icaaedb8fd5f585ce7c632a6c52fdb286fc60eb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:12:07 +00:00