From 85f933f0563f7b61c3b98e624f3bf1a19d952161 Mon Sep 17 00:00:00 2001
From: Angela Wang <angelala@google.com>
Date: Tue, 26 Mar 2024 09:54:39 +0000
Subject: [PATCH] Fix button insufficient contrast ratio problem

Apply textColorSecondary as the tint color for the arrow icon to prevent
insufficient contrast ration problem under light theme.

Bug: 331139289
Test: manually check the UI
Change-Id: I010a6129cdd7bf11840421abc5f53156433b6708
---
 res/layout/arrow_preference.xml        | 56 --------------------------
 res/layout/preference_widget_arrow.xml |  1 +
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 res/layout/arrow_preference.xml

diff --git a/res/layout/arrow_preference.xml b/res/layout/arrow_preference.xml
deleted file mode 100644
index 0924a4452b2..00000000000
--- a/res/layout/arrow_preference.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingVertical="@dimen/settingslib_switchbar_margin"
-    android:background="@android:color/transparent">
-
-    <LinearLayout
-        android:id="@+id/background"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:paddingStart="@dimen/settingslib_switchbar_padding_left"
-        android:paddingEnd="@dimen/settingslib_switchbar_padding_right"
-        android:background="@drawable/settingslib_switch_bar_bg_on"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:layout_gravity="start|center_vertical"
-            android:layout_weight="1"
-            android:paddingVertical="@dimen/settingslib_switch_title_margin"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:hyphenationFrequency="normalFast"
-            android:lineBreakWordStyle="phrase"
-            style="@style/MainSwitchText.Settingslib"/>
-
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@null"
-            android:src="@drawable/ic_arrow_forward"/>
-
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/preference_widget_arrow.xml b/res/layout/preference_widget_arrow.xml
index ddeb669142e..e7a3f8233a0 100644
--- a/res/layout/preference_widget_arrow.xml
+++ b/res/layout/preference_widget_arrow.xml
@@ -22,4 +22,5 @@
     android:layout_gravity="center_vertical"
     android:contentDescription="@null"
     android:scaleType="center"
+    android:tint="?android:attr/textColorPrimary"
     android:src="@drawable/ic_arrow_forward" />
\ No newline at end of file