Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13632ab0 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Code refactor - reuseable layout extration"

parents d9f2de7a d68d0df9
Loading
Loading
Loading
Loading
+2 −12
Original line number Diff line number Diff line
@@ -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"
+33 −0
Original line number Diff line number Diff line
<?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>