From 4cccc145c529d03408706369d8afdb0b5779ee8e Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Wed, 19 Jul 2023 17:07:07 +0800
Subject: [PATCH 1/3] gps: remove unused sensors

Bug: 291538679
Test: Verify driving test and VDR engaged rate doesn't impact
Change-Id: Idf936d8029e76f19b02945f67e11f89a34c36b69
---
 location/gps.xml.f10      | 1 +
 location/gps_user.xml.f10 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/location/gps.xml.f10 b/location/gps.xml.f10
index 6e005ae..9c15f8c 100644
--- a/location/gps.xml.f10
+++ b/location/gps.xml.f10
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10
index 02afd01..8b8e7ba 100644
--- a/location/gps_user.xml.f10
+++ b/location/gps_user.xml.f10
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+       SensorsMask="0x244"
   />
 
   <gll

From 23866b406d88220b789f6a427ae3fdc3e5cdd039 Mon Sep 17 00:00:00 2001
From: Leo Chen <yinchiuan@google.com>
Date: Fri, 21 Jul 2023 03:01:43 +0000
Subject: [PATCH 2/3] Update IDisplay to V9

Bug: 255986866
Bug: 227384721
Change-Id: I7128d23da86c2a83674784a3857c15735b0f1439
---
 device_framework_matrix_product_felix.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product_felix.xml b/device_framework_matrix_product_felix.xml
index 7f4a680..7594e3c 100644
--- a/device_framework_matrix_product_felix.xml
+++ b/device_framework_matrix_product_felix.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>8</version>
+        <version>9</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>

From 84485a4bded56ebfa94fd95120820cec40048854 Mon Sep 17 00:00:00 2001
From: Shawn Lin <shawnlin@google.com>
Date: Mon, 17 Jul 2023 12:26:12 +0000
Subject: [PATCH 3/3] Fix layout issue of pattern set up page in F10

Set the pattern view size to 290dp for F10

Bug: 285290323
Bug: 290721507
Test: manual
Test: Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
      SetupChooseLockPatternTest
Change-Id: I0bd45ad6f793afdec96ffd4a538539d040ad4993
(cherry picked from commit f3e62f0321753a6740d7b871a5fc9a90c096c63c)
---
 .../Settings/res/values-sw410dp/dimens.xml    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml

diff --git a/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml b/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml
new file mode 100644
index 0000000..179dcc5
--- /dev/null
+++ b/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Lock pattern view size, align sysui biometric_auth_pattern_view_size -->
+    <dimen name="biometric_auth_pattern_view_size">290dp</dimen>
+
+</resources>