summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/deviceinfo
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-07-16 05:01:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-16 05:01:27 +0000
commit046decca29376aba5b97b78900bfd867ca3f310c (patch)
treeba587eb123800f1a7d49940c706bf2bf35567a25 /src/com/android/settings/deviceinfo
parentbec1d295586b752f81f523c8339dcd49c586d722 (diff)
parentc06f9b6721e5831fffd750653ddbc1e23e32dfae (diff)
downloadpackages_apps_Settings-046decca29376aba5b97b78900bfd867ca3f310c.zip
packages_apps_Settings-046decca29376aba5b97b78900bfd867ca3f310c.tar.gz
packages_apps_Settings-046decca29376aba5b97b78900bfd867ca3f310c.tar.bz2
Merge "Use common xml file for multi-tab settings." into mnc-dev
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r--src/com/android/settings/deviceinfo/SimStatus.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index e25aed6..83043c7 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -150,7 +150,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
if (mSelectableSubInfos.size() > 1) {
- setContentView(R.layout.sim_information);
+ setContentView(com.android.internal.R.layout.common_tab_settings);
mTabHost = (TabHost) findViewById(android.R.id.tabhost);
mTabWidget = (TabWidget) findViewById(android.R.id.tabs);