From 9ff8a1a9a738535b4a9c8af24143a7efe906d790 Mon Sep 17 00:00:00 2001
From: pashalee <pashalee@google.com>
Date: Wed, 11 Jan 2023 08:07:58 +0000
Subject: [PATCH 1/2] add powerhint for fusion zoom

Bug: 262862625
Test: manual tests

Change-Id: I97e6fe57a3393bafb60c57557f003fc64ffcaef8
---
 powerhint.json | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index 02df61c..9d2338e 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -53,6 +53,8 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
+        "2253000",
+        "2130000",
         "1024000",
         "1197000",
         "1491000",
@@ -70,6 +72,8 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "2253000",
+        "2130000",
         "1836000",
         "1197000",
         "0"
@@ -81,6 +85,9 @@
       "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
+        "2704000",
+        "2507000",
+        "2252000",
         "984000",
         "1426000",
         "1826000",
@@ -98,6 +105,9 @@
       "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "2704000",
+        "2507000",
+        "2252000",
         "1826000",
         "1106000",
         "0"
@@ -864,6 +874,108 @@
       "Duration": 1000,
       "Value": "664000"
     },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
+      "Node": "TAPreferHighCap",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "2704000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 3000,
+      "Value": "2704000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
+      "Node": "TAPreferHighCap",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "2507000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 3000,
+      "Value": "2507000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
+      "Node": "TAPreferHighCap",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "2252000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 3000,
+      "Value": "2252000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1",
+      "Node": "CPUMidClusterMinFreq",
+      "Duration": 3000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "2253000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
+      "Node": "CPUMidClusterMinFreq",
+      "Duration": 3000,
+      "Value": "2253000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3",
+      "Node": "CPUMidClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "2130000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3",
+      "Node": "CPUMidClusterMinFreq",
+      "Duration": 3000,
+      "Value": "2130000"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_LITTLECPU_RANK1",
+      "Node": "CPULittleClusterMaxFreq",
+      "Duration": 3000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "GCA_CAMERA_SHOT_LITTLECPU_RANK1",
+      "Node": "CPULittleClusterMinFreq",
+      "Duration": 3000,
+      "Value": "9999999"
+    },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
       "Node": "TAPreferHighCap",

From ca78ce4056339623ee81167646b61138e90f867d Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Mon, 16 Jan 2023 14:44:39 +0000
Subject: [PATCH 2/2] Fix expanded Accessibility overlaps with Face Circle in
 Educational Screen

Fine-tuning Face enroll education page layout for expanding
Accessibility option.

Bug: 265474776

Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation with turned on expanded Accessibility option, and
they should not be truncated.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"

Change-Id: I42e28a36fac9cd07dcacd4a16aab09de99211350
---
 .../apps/Settings/res/values/dimens.xml       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/felix/overlay/packages/apps/Settings/res/values/dimens.xml b/felix/overlay/packages/apps/Settings/res/values/dimens.xml
index 7e399a1..e6b49b4 100755
--- a/felix/overlay/packages/apps/Settings/res/values/dimens.xml
+++ b/felix/overlay/packages/apps/Settings/res/values/dimens.xml
@@ -16,14 +16,14 @@
 
 <resources>
     <!-- Biometrics Face enroll education dimensions-->
-    <dimen name="face_enroll_icon_large_width">260dp</dimen>
-    <dimen name="face_enroll_icon_large_height">260dp</dimen>
-    <dimen name="illustration_lottie_height">360dp</dimen>
-    <dimen name="illustration_accessibility_margin_top">-18dp</dimen>
-    <dimen name="face_enroll_education_lottie_frame_margin_top">-34dp</dimen>
-    <dimen name="lottie_animation_view_margin_top">-52dp</dimen>
-    <dimen name="limited_vision_button_frame_margin_top">-34dp</dimen>
-    <dimen name="limited_vision_button_margin_top">10dp</dimen>
-    <dimen name="limited_vision_button_margin_bottom">10dp</dimen>
-    <dimen name="limited_vision_button_toggle_margin_top">-26dp</dimen>
+    <dimen name="face_enroll_icon_large_width">200dp</dimen>
+    <dimen name="face_enroll_icon_large_height">200dp</dimen>
+    <dimen name="illustration_lottie_height">330dp</dimen>
+    <dimen name="illustration_accessibility_margin_top">-24dp</dimen>
+    <dimen name="face_enroll_education_lottie_frame_margin_top">-36dp</dimen>
+    <dimen name="lottie_animation_view_margin_top">-64dp</dimen>
+    <dimen name="limited_vision_button_frame_margin_top">-36dp</dimen>
+    <dimen name="limited_vision_button_margin_top">12dp</dimen>
+    <dimen name="limited_vision_button_margin_bottom">12dp</dimen>
+    <dimen name="limited_vision_button_toggle_margin_top">-28dp</dimen>
 </resources>