Remove a few MSIM tab hosts.

Change-Id: Idd0b7738685ba05fc7c6a85306fcf5e5b08203ff

3 files changed, 5 insertions, 72 deletions

diff --git a/res/layout/icc_lock_tabs.xml b/res/layout/icc_lock_tabs.xml
deleted file mode 100644
index d2a4acc..0000000
--- a/res/layout/icc_lock_tabs.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/tabhost"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:id="@+id/tabs_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scrollbars="none"
-            android:fillViewport="true">
-
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                style="?android:attr/tabWidgetStyle" />
-
-        </HorizontalScrollView>
-
-        <!-- give an empty content area to make tabhost happy -->
-        <FrameLayout
-            android:id="@android:id/tabcontent"
-            android:layout_width="0dip"
-            android:layout_height="0dip" />
-
-        <ListView
-            android:id="@android:id/list"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:smoothScrollbar="false" />
-
-    </LinearLayout>
-
-</TabHost>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 7741e2a..326d028 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1044,6 +1044,11 @@
     <string name="primary_sub_select_title">Default 3G/LTE subscription</string>
     <string name="select_sim_card">Select SIM card</string>
 
+    <!-- MSIM SIM status -->
+    <string name="sim_card_status_title">SIM %d status</string>
+    <string name="sim_card_lock_settings_title">SIM %d lock settings</string>
+    <string name="sim_card_summary_empty">SIM not inserted</string>
+
     <!-- Zen mode allowed event setting summary items -->
     <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
     <string name="zen_mode_summary_reminders">reminders</string>
diff --git a/res/xml/device_info_sim_status.xml b/res/xml/device_info_sim_status.xml
index 9e9444d..812b77a 100644
--- a/res/xml/device_info_sim_status.xml
+++ b/res/xml/device_info_sim_status.xml
@@ -65,16 +65,4 @@
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
 
-    <Preference android:key="imei"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_imei"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-
-    <Preference android:key="imei_sv"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_imei_sv"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-
 </PreferenceScreen>