diff options
| author | DvTonder <david.vantonder@gmail.com> | 2013-03-01 11:00:32 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-03-01 11:00:32 -0800 |
| commit | 2afb91bbabc66b783e30466185435fe8adcc0b79 (patch) | |
| tree | ee54289842769a23c0031052fb6a5aa8fd4d28d8 | |
| parent | 6d067ae77b17e90143bcd75ca240caf75e7d2639 (diff) | |
| parent | 5aaa6201906192df82f02718db9690c738eca0ab (diff) | |
| download | packages_apps_settings-2afb91bbabc66b783e30466185435fe8adcc0b79.zip packages_apps_settings-2afb91bbabc66b783e30466185435fe8adcc0b79.tar.gz packages_apps_settings-2afb91bbabc66b783e30466185435fe8adcc0b79.tar.bz2 | |
Merge "Settings: Add LTE Quick Settings Tile (2 of 2)" into cm-10.1
| -rw-r--r-- | src/com/android/settings/cyanogenmod/QuickSettings.java | 7 | ||||
| -rw-r--r-- | src/com/android/settings/cyanogenmod/QuickSettingsUtil.java | 15 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/com/android/settings/cyanogenmod/QuickSettings.java b/src/com/android/settings/cyanogenmod/QuickSettings.java index 089fd75..829306f 100644 --- a/src/com/android/settings/cyanogenmod/QuickSettings.java +++ b/src/com/android/settings/cyanogenmod/QuickSettings.java @@ -22,7 +22,9 @@ import static com.android.internal.util.cm.QSConstants.TILE_NETWORKMODE; import static com.android.internal.util.cm.QSConstants.TILE_NFC; import static com.android.internal.util.cm.QSConstants.TILE_PROFILE; import static com.android.internal.util.cm.QSConstants.TILE_WIFIAP; +import static com.android.internal.util.cm.QSConstants.TILE_LTE; import static com.android.internal.util.cm.QSUtils.deviceSupportsBluetooth; +import static com.android.internal.util.cm.QSUtils.deviceSupportsLte; import static com.android.internal.util.cm.QSUtils.deviceSupportsNfc; import static com.android.internal.util.cm.QSUtils.deviceSupportsUsbTether; import static com.android.internal.util.cm.QSUtils.deviceSupportsWifiDisplay; @@ -216,6 +218,11 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe QuickSettingsUtil.TILES.remove(TILE_NFC); } + // Dont show the LTE tile if not supported + if (!deviceSupportsLte(getActivity())) { + QuickSettingsUtil.TILES.remove(TILE_LTE); + } + } public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { diff --git a/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java b/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java index 8e32a62..29456bd 100644 --- a/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java +++ b/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java @@ -25,6 +25,7 @@ import static com.android.internal.util.cm.QSConstants.TILE_BRIGHTNESS; import static com.android.internal.util.cm.QSConstants.TILE_DELIMITER; import static com.android.internal.util.cm.QSConstants.TILE_GPS; import static com.android.internal.util.cm.QSConstants.TILE_LOCKSCREEN; +import static com.android.internal.util.cm.QSConstants.TILE_LTE; import static com.android.internal.util.cm.QSConstants.TILE_MOBILEDATA; import static com.android.internal.util.cm.QSConstants.TILE_NETWORKMODE; import static com.android.internal.util.cm.QSConstants.TILE_NFC; @@ -79,6 +80,9 @@ public class QuickSettingsUtil { TILES.put(TILE_LOCKSCREEN, new QuickSettingsUtil.TileInfo( TILE_LOCKSCREEN, R.string.title_tile_lockscreen, "com.android.systemui:drawable/ic_qs_lock_screen_off")); + TILES.put(TILE_LTE, new QuickSettingsUtil.TileInfo( + TILE_LTE, R.string.title_tile_lte, + "com.android.systemui:drawable/ic_qs_lte_off")); TILES.put(TILE_MOBILEDATA, new QuickSettingsUtil.TileInfo( TILE_MOBILEDATA, R.string.title_tile_mobiledata, "com.android.systemui:drawable/ic_qs_signal_4")); @@ -121,17 +125,6 @@ public class QuickSettingsUtil { TILES.put(TILE_USER, new QuickSettingsUtil.TileInfo( TILE_USER, R.string.title_tile_user, "com.android.systemui:drawable/ic_qs_default_user")); - -// These toggles are not available yet. Comment out for now -// if(PhoneConstants.LTE_ON_CDMA_TRUE == TelephonyManager.getDefault().getLteOnCdmaMode() || -// TelephonyManager.getDefault().getLteOnGsmMode() != 0) { -// TILES.put(TILE_LTE, new QuickSettingsUtil.TileInfo( -// TILE_LTE, R.string.title_tile_lte, -// "com.android.systemui:drawable/stat_lte_on")); -// } -// TILES.put(TILE_WIMAX, new QuickSettingsUtil.TileInfo( -// TILE_WIMAX, R.string.title_tile_wimax, -// "com.android.systemui:drawable/stat_wimax_on")); } public static String getCurrentTiles(Context context) { |