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

120258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
menghanli
5c888e7727 fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921 am: 0f1f626537 am: 1acdb1452d am: c3343de553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798

Change-Id: Ie45a851f002759f69e2e1205e2fc26ecf07ac871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 06:39:22 +00:00
Angela Wang
0e48c55a2a Fixes fail test cases in AccessibilitySettingsTest 
AccessibilityHearingAidPreferenceController can't be instantiated
correctly in tests with the lack of LocalBluetoothManager. This causes
null pointer exception when
AccessibilityHearingAidPreferenceController.setFragmentManager() is
called in AccessibilitySettings.onAttach().

Solution: Mocks the LocalBluetoothManager for tests to successfully
instantiate AccessibilityHearingAidPreferenceController to prevent null
pointer exception from happening.

Bug: 269407238
Test: atest AccessibilitySettingsTest
Change-Id: Ibcfffa10b46fd6e85c1b74b03343e5ee0e8843b3
 2023-02-20 06:33:58 +00:00
Zaiyue Xue
67fd7d8f6f Move the same-name-different-product configs from res folder to res-product folder 
This could unblock the build in go/settings-studio.

Bug: 269974284
Fix: 269974284
Test: presubmit
Change-Id: I962ce24c827d6412af2b861753ae57bd17a27de2
 2023-02-20 14:06:09 +08:00
TreeHugger Robot
0f7889fe5b Merge "Attach v2 EnrollingSfpsFragment to activity" into udc-dev am: 4951384ba2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489369

Change-Id: I35b648dde9dd38a1f9538627357c39c0865343d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 05:31:10 +00:00
menghanli
c3343de553 fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921 am: 0f1f626537 am: 1acdb1452d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798

Change-Id: I403f187017005654e047ea84c7ed28e1aa4bc79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 05:30:20 +00:00
TreeHugger Robot
c4f41cdf54 Merge "Attach v2 EnrollingSfpsFragment to activity" into udc-dev am: 4951384ba2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489369

Change-Id: I8c19f9621259923112b0a7316dc958600d0f3d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 05:29:25 +00:00
menghanli
c90bd4a2d0 fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921 am: 0f1f626537 am: 1acdb1452d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798

Change-Id: I6f57b3b5ca9cdd0de75791ffb44120f357f24849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 05:27:53 +00:00
TreeHugger Robot
4951384ba2 Merge "Attach v2 EnrollingSfpsFragment to activity" into udc-dev 2023-02-20 04:35:54 +00:00
menghanli
1acdb1452d fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921 am: 0f1f626537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798

Change-Id: I5a1670b2bc7da6641c4858496a3b162ebdc51393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 04:00:26 +00:00
Milton Wu
20c73a9b06 Attach v2 EnrollingSfpsFragment to activity 
1. Attach FingerprintEnrollEnrollingSfpsFragment to
   FingerprintEnrollmentActivity.
2. Refine FinSensor rotation case for SFPS and RFPS

Bug: 260957939
Test: atest FingerprintEnrollmentActivityTest
Change-Id: Ibbeff8deb009271df044480f9f5d6c64ab6e6264
 2023-02-20 03:48:16 +00:00
menghanli
0f1f626537 fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences am: 8547eb1921 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466798

Change-Id: I013125cc4d8d979a916a5b585c175698d4502dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 03:01:13 +00:00
Zoey Chen
9f04b73bef [Settings] 1.Clean up unnecessary callback 2. register listener and am: 5645c092a9 am: 0b0000a9ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478832

Change-Id: Ib9703724b779386d049014c3a8b5eee2b17f09ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 21:15:59 +00:00
Zoey Chen
0b0000a9ab [Settings] 1.Clean up unnecessary callback 2. register listener and am: 5645c092a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478832

Change-Id: Ie7bfd2a150f5ff203b5566876457d87b5ddbf8de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 19:57:18 +00:00
Zoey Chen
0a5f32e6af [Settings] 1.Clean up unnecessary callback 2. register listener and am: 5645c092a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478832

Change-Id: I95f3d0e0b470bebfdaf3187dced5f6897eeb6a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 19:55:00 +00:00
Jiaming Liu
da7f685695 Fix build for jetpack update 
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a)
(cherry picked from commit 5a6444776a)
(cherry picked from commit 1c0af48f8c)
 2023-02-18 17:01:11 +00:00
Diego Vela
585a7f3c7a Update ActivityEmbedding usage. 
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
(cherry picked from commit 65bb5a09f4)
(cherry picked from commit d2dfc4285e)
 2023-02-18 16:27:45 +00:00
Angela Wang
fd5f121a55 Fixes fail test cases in AccessibilitySettingsTest 
AccessibilityHearingAidPreferenceController can't be instantiated
correctly in tests with the lack of LocalBluetoothManager. This causes
null pointer exception when
AccessibilityHearingAidPreferenceController.setFragmentManager() is
called in AccessibilitySettings.onAttach().

Solution: Mocks the LocalBluetoothManager for tests to successfully
instantiate AccessibilityHearingAidPreferenceController to prevent null
pointer exception from happening.

Bug: 269407238
Test: atest AccessibilitySettingsTest
Change-Id: Ibcfffa10b46fd6e85c1b74b03343e5ee0e8843b3
 2023-02-18 13:37:13 +00:00
Zoey Chen
5645c092a9 [Settings] 1.Clean up unnecessary callback 2. register listener and 
manager by subId

Bug: 269742364
Test: manual
Change-Id: Id536dedb200385dc6de5697848f8a68f2302351f
 2023-02-18 07:28:56 +00:00
Menghan Li
76dc797e20 Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb am: 888f534cef am: 15ba200a81 am: 7376b55651 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: I5154632d152d4e79640ce772fbad5caa7ffcd293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 07:18:45 +00:00
Tyler Freeman
d21327c2a0 fix(tablet): fix magnification banner in dark mode am: 44660662f1 am: 0572328763 am: bbdcb3506a am: 7a3e26b9cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797

Change-Id: Idd3d2ec09d6409c07056e687bbe84ff225d9fcc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 07:14:33 +00:00
Menghan Li
7376b55651 Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb am: 888f534cef am: 15ba200a81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: I6446163fb5a75cea92dd09a745216c20d2ecb4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 06:09:05 +00:00
Menghan Li
dbbadb14e3 Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb am: 888f534cef am: 15ba200a81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: I2e24e30e207dbba3f8a33bdf7a0ffa6d2054b610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 06:09:04 +00:00
Tyler Freeman
7a3e26b9cf fix(tablet): fix magnification banner in dark mode am: 44660662f1 am: 0572328763 am: bbdcb3506a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797

Change-Id: Ideecd82263b6e46fd897b7c90a9a14066009b287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 06:06:19 +00:00
Tyler Freeman
a235a19401 fix(tablet): fix magnification banner in dark mode am: 44660662f1 am: 0572328763 am: bbdcb3506a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797

Change-Id: I527db51e653055b7935cb89b08312ac66d8a86fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 06:05:22 +00:00
menghanli
8547eb1921 fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences 
Fix: 269717670
Test: 1. Go to Settings > Accessibility shortcuts > accessibility button & gesture.
2. Observe The Gesture's picture.
3. Go to any other accessibility's shortcut.
4. Observe the picture of the Use accessibility gesture. #2 should look like #4

Change-Id: I11f64648412c9795383d356e80d9dd499095f53b
 2023-02-18 13:53:24 +08:00
Menghan Li
15ba200a81 Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb am: 888f534cef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: I1502bbc8112692c40534a57361a91a85f8977eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 04:37:57 +00:00
Tyler Freeman
bbdcb3506a fix(tablet): fix magnification banner in dark mode am: 44660662f1 am: 0572328763 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797

Change-Id: I949c5a2c919ee266ae7f28bd9c6ab4f3d55013fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 04:36:40 +00:00
Menghan Li
888f534cef Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev am: aa189347fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466796

Change-Id: If09f5e93946ec39b2a8848de07b9c331f2a57dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 03:36:43 +00:00
Tyler Freeman
0572328763 fix(tablet): fix magnification banner in dark mode am: 44660662f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21466797

Change-Id: Ide63caf3bfb6e717f8432f759e0767e8624001ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-18 03:35:51 +00:00
Menghan Li
aa189347fb Merge "fix(tablet assets): update a11y button navigation asset for tablets" into tm-qpr-dev 2023-02-18 02:43:12 +00:00
menghanli
e1ce633dd4 fix(tablet assets): update a11y button navigation asset for tablets 
Fix: 269707768
Test: Go to Settings > Accessibility > Accessibility shortcuts > Accessibility button > Location to "Navigation bar".
Change-Id: I2d56a104848c93d8e6d138c849d05b4a77388c3b
 2023-02-18 08:43:36 +08:00
Eric Biggers
bcee8ce1af Stop calling LockPatternUtils.setVisiblePasswordEnabled() 
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.

Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest.  Note,
      isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
 2023-02-18 00:24:40 +00:00
Tyler Freeman
44660662f1 fix(tablet): fix magnification banner in dark mode 
Fix: 269717590
Test: Go to Settings > Accessibility > Magnification. Banner should be light A on dark background
Change-Id: Ia9bb696365afc63f4b94048e95a4a41b5680e621
 2023-02-18 06:57:03 +08:00
Edgar Wang
ae2d8a7682 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0 am: a782dd0423 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I4a2d869ab5df76f0c8ca82159ff30cd7bdef2a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 22:40:09 +00:00
Edgar Wang
b37b1dc2e1 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: Ib6c0bdc168410c61cd83c7052a549fd207168de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 21:23:41 +00:00
Edgar Wang
a782dd0423 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I63d4ba1fa7676d7c83e9a9ac4e838e17e662a434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 21:20:19 +00:00
Edgar Wang
962a3932d0 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: Ib679057af4da62fe48d94cebc344f477ce438a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 19:51:11 +00:00
Edgar Wang
420cc9114f Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I894b14ab6af7a20469c57b275780597db09d8225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 18:52:37 +00:00
TreeHugger Robot
1e6c6b6f7c [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours am: 8872d5e8a4 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: I508d5e29fa98385f6fdd473c9ab2cb566e90ce8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 18:45:46 +00:00
TreeHugger Robot
44f70036b5 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours am: b7ba47c9b2 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: I3832412752cd2239a0e0f0fe89084aed6b1689c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 18:44:24 +00:00
Edgar Wang
27d53afa8d Merge "Move tablet resources to product overlay folder" into tm-qpr-dev 2023-02-17 18:10:59 +00:00
TreeHugger Robot
8872d5e8a4 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: If4c670b0093914650a01822eec2361f0b85b5976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 17:37:11 +00:00
TreeHugger Robot
9bdca81393 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: Id0658333fcfd4b7b82afcdb94a419c2433557444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 17:36:37 +00:00
TreeHugger Robot
b7ba47c9b2 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: I480a87927d4fa75df8a18974065a4458ecb62b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 17:36:21 +00:00
TreeHugger Robot
71cc63dcf2 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: I97f9354c70ead2c5ba7969f8e5b2f5e04d8860d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 17:33:53 +00:00
Carbo Kuo
bd18ca11d0 Merge "Migrate the About page in Settings." 2023-02-17 16:32:54 +00:00
TreeHugger Robot
f144ed6e00 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: I0d754479cb73df75e32008aa6f8a65579e9906fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 16:11:55 +00:00
TreeHugger Robot
82736a7d86 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: Id346fa53a9bf4840483f233516e265dbf552ce54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 16:06:49 +00:00
TreeHugger Robot
966de44fd9 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446

Change-Id: I8e50b809f73f0f4913672f87f797d9fb4700be99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 15:13:11 +00:00
TreeHugger Robot
510d653b7f Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445

Change-Id: I743f719b6d2561c2f1badd44b36ed623c0206a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-17 15:12:16 +00:00