From d68d0df9400440b3aa05d998bcac45115af43676 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Fri, 16 Dec 2022 08:42:41 +0000
Subject: [PATCH] [Settings] Code refactor - reuseable layout extration

This is a change to extract EID layout for easily moving it to somewhere
else.

Bug: 260540995
Test: local
Change-Id: Ic7eb257d8d6b30564bc1a63c9b35676784c13d81
---
 res/layout/dialog_sim_status.xml | 14 ++------------
 res/xml/esim_eid_and_qrcode.xml  | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 res/xml/esim_eid_and_qrcode.xml

diff --git a/res/layout/dialog_sim_status.xml b/res/layout/dialog_sim_status.xml
index 4fc7f4620d0..b9abb15598b 100644
--- a/res/layout/dialog_sim_status.xml
+++ b/res/layout/dialog_sim_status.xml
@@ -162,18 +162,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/status_esim_id"/>
-        <TextView
-            style="@style/device_info_dialog_value"
-            android:id="@+id/esim_id_value"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textIsSelectable="true"
-            android:text="@string/device_info_not_available"/>
-        <ImageView
-            android:id="@+id/esim_id_qrcode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="ContentDescription" />
+
+        <include layout="@xml/esim_eid_and_qrcode" />
 
         <TextView
             style="@style/device_info_dialog_label"
diff --git a/res/xml/esim_eid_and_qrcode.xml b/res/xml/esim_eid_and_qrcode.xml
new file mode 100644
index 00000000000..b1f16344afc
--- /dev/null
+++ b/res/xml/esim_eid_and_qrcode.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+        style="@style/device_info_dialog_value"
+        android:id="@+id/esim_id_value"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="true"
+        android:text="@string/device_info_not_available"/>
+    <ImageView
+        android:id="@+id/esim_id_qrcode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="ContentDescription" />
+
+</merge>