diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:41:31 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:41:31 +0100 |
| commit | e9afa929acbcdeceaf546ce993f072d183452edd (patch) | |
| tree | 2b2cd47fc024946292007a123876a3dad220dc05 /src/com/android/settings/SettingsActivity.java | |
| parent | b8c954b9061a7b04f0f30b0b2d52ae6b96b0f949 (diff) | |
| parent | c971ae3f9f34b0b4ca5aabacb6de7e1afb9f320d (diff) | |
| download | packages_apps_Settings-e9afa929acbcdeceaf546ce993f072d183452edd.zip packages_apps_Settings-e9afa929acbcdeceaf546ce993f072d183452edd.tar.gz packages_apps_Settings-e9afa929acbcdeceaf546ce993f072d183452edd.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
src/com/android/settings/cmstats/AnonymousStats.java
src/com/android/settings/cmstats/PreviewData.java
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index abf300f..4dd722e 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1217,10 +1217,7 @@ public class SettingsActivity extends Activity curBundle = null; } - // Show the SIM Cards setting if there are more than 2 SIMs installed. - if(tile.id != R.id.sim_settings || Utils.showSimCardTile(context)){ - category.addTile(tile); - } + category.addTile(tile); } else if (innerNodeName.equals("external-tiles")) { category.externalIndex = category.getTilesCount(); @@ -1279,7 +1276,12 @@ public class SettingsActivity extends Activity removeTile = true; } } else if (id == R.id.mobile_networks) { - if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { + if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY) + || Utils.showSimCardTile(this)) { + removeTile = true; + } + } else if (id == R.id.sim_settings) { + if (!Utils.showSimCardTile(this)) { removeTile = true; } } else if (id == R.id.data_usage_settings) { |