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

Commit 6fa3b890 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move IMS registration state to SIM status screen" into pi-dev

parents caf72cf3 649751a4

res/layout/dialog_sim_status.xml

+13 −0
Original line number Diff line number Diff line
@@ -167,5 +167,18 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/device_info_not_available"/>



        <TextView

            style="@style/device_info_dialog_label"

            android:id="@+id/ims_reg_state_label"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/ims_reg_title"/>

        <TextView

            style="@style/device_info_dialog_value"

            android:id="@+id/ims_reg_state_value"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/device_info_not_available"/>

    </LinearLayout>

</ScrollView>

res/xml/device_info_settings.xml

+0 −7
Original line number Diff line number Diff line
@@ -60,13 +60,6 @@ 
        settings:keywords="@string/keywords_android_version"

        android:summary="@string/summary_placeholder"/>



    <!-- IMS registration -->

    <Preference

        android:key="ims_reg_state"

        android:order="33"

        android:title="@string/ims_reg_title"

        android:summary="@string/summary_placeholder"/>



    <!--IP address -->

    <Preference

        android:key="wifi_ip_address"

res/xml/my_device_info.xml

+0 −7
Original line number Diff line number Diff line
@@ -104,13 +104,6 @@ 
        settings:keywords="@string/keywords_android_version"

        android:summary="@string/summary_placeholder"/>



    <!-- IMS registration -->

    <Preference

        android:key="ims_reg_state"

        android:order="33"

        android:title="@string/ims_reg_title"

        android:summary="@string/summary_placeholder"/>



    <!--IP address -->

    <Preference

        android:key="wifi_ip_address"

src/com/android/settings/deviceinfo/DeviceInfoSettings.java

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
        controllers.add(new DeviceModelPreferenceController(context, fragment));

        controllers.add(new ImeiInfoPreferenceController(context, fragment));

        controllers.add(new FirmwareVersionPreferenceController(context, fragment));

        controllers.add(new ImsStatusPreferenceController(context, lifecycle));

        controllers.add(new IpAddressPreferenceController(context, lifecycle));

        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));

        controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));

src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.settings.deviceinfo.DeviceModelPreferenceController; 
import com.android.settings.deviceinfo.DeviceNamePreferenceController;

import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;

import com.android.settings.deviceinfo.FeedbackPreferenceController;

import com.android.settings.deviceinfo.ImsStatusPreferenceController;

import com.android.settings.deviceinfo.IpAddressPreferenceController;

import com.android.settings.deviceinfo.ManualPreferenceController;

import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
@@ -113,7 +112,6 @@ public class MyDeviceInfoFragment extends DashboardFragment { 
        controllers.add(new DeviceModelPreferenceController(context, fragment));

        controllers.add(new ImeiInfoPreferenceController(context, fragment));

        controllers.add(new FirmwareVersionPreferenceController(context, fragment));

        controllers.add(new ImsStatusPreferenceController(context, lifecycle));

        controllers.add(new IpAddressPreferenceController(context, lifecycle));

        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));

        controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));