commit 18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9
author Jason Monk <jmonk@google.com> Wed Apr 20 17:32:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 20 17:32:39 2016 +0000
tree dd88e69acab89d300935f04fa45371ed0c02a695
parent 018d99cd288622bc4daf37b969e3340441bcb28d
parent e9dffcd34df3b1919f3843e0c0013fb793699e3f

Merge "Fix sim status screen" into nyc-dev
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491

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

diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 80dfc58..0acad37 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -151,7 +151,7 @@
             mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
 
             if (mSelectableSubInfos.size() > 1) {
-                setContentView(com.android.internal.R.layout.common_tab_settings);
+                setContentView(R.layout.icc_lock_tabs);
 
                 mTabHost = (TabHost) findViewById(android.R.id.tabhost);
                 mTabWidget = (TabWidget) findViewById(android.R.id.tabs);