From 16e4410d307ff60c029b2390ba6fc61b5e4828ab Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Wed, 31 Mar 2021 15:05:42 +0800
Subject: [PATCH] Rename image_frame to build pass after copy it to another
 path.

- image_frame.xml will conflict with Preference resource in another
  path.

Bug: 184597455
Test: rebuild
Change-Id: Ie5dec05f93f818fb17dc386997d5bf00f97ea4da
---
 .../res/layout/{image_frame.xml => settings_icon.xml}           | 0
 .../SettingsTheme/res/layout/settings_preference.xml            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/SettingsLib/SettingsTheme/res/layout/{image_frame.xml => settings_icon.xml} (100%)

diff --git a/packages/SettingsLib/SettingsTheme/res/layout/image_frame.xml b/packages/SettingsLib/SettingsTheme/res/layout/settings_icon.xml
similarity index 100%
rename from packages/SettingsLib/SettingsTheme/res/layout/image_frame.xml
rename to packages/SettingsLib/SettingsTheme/res/layout/settings_icon.xml
diff --git a/packages/SettingsLib/SettingsTheme/res/layout/settings_preference.xml b/packages/SettingsLib/SettingsTheme/res/layout/settings_preference.xml
index 3a289a7ceb007..d2b3169369ae8 100644
--- a/packages/SettingsLib/SettingsTheme/res/layout/settings_preference.xml
+++ b/packages/SettingsLib/SettingsTheme/res/layout/settings_preference.xml
@@ -29,7 +29,7 @@
     android:clipToPadding="false"
     android:baselineAligned="false">
 
-    <include layout="@layout/image_frame"/>
+    <include layout="@layout/settings_icon"/>
 
     <RelativeLayout
         android:layout_width="0dp"