From e3951e39efc5653e054a39c96e9280659b45dc85 Mon Sep 17 00:00:00 2001
From: Massimo Carli <mcarli@google.com>
Date: Fri, 22 Sep 2023 10:01:14 +0000
Subject: [PATCH 1/2] Use experimental string in  user aspect ratio settings

Bug: 300219974
Test: Manual

Change-Id: I92b23e525f6c48d11e61080af5502c68ec9059e0
---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a570bbb6670..453a71e1ad0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1582,7 +1582,7 @@
 
         <activity android:name="Settings$UserAspectRatioAppListActivity"
             android:exported="true"
-            android:label="@string/aspect_ratio_title">
+            android:label="@string/aspect_ratio_experimental_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1595,7 +1595,7 @@
 
         <activity android:name="Settings$UserAspectRatioAppActivity"
                   android:exported="true"
-                  android:label="@string/aspect_ratio_title">
+                  android:label="@string/aspect_ratio_experimental_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />

From 7a4d2720e47893e68915e736a429cadc73c573e0 Mon Sep 17 00:00:00 2001
From: Isaac Katzenelson <isaackatz@google.com>
Date: Fri, 22 Sep 2023 22:34:15 +0000
Subject: [PATCH 2/2] Fix tint of battery icon

Bug: 300559036
Test: Visual test
Change-Id: Id4c7e7ec9f330432c01fa7fcee2474b2fe61f642
---
 res/drawable/ic_battery_full.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/drawable/ic_battery_full.xml b/res/drawable/ic_battery_full.xml
index 8b1321f68ce..5dfac5553aa 100644
--- a/res/drawable/ic_battery_full.xml
+++ b/res/drawable/ic_battery_full.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="960"
         android:viewportHeight="960"
-        android:tint="?attr/colorControlNormal">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880Z"/>