summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kasick <mike@kasick.org>2012-12-03 22:39:56 -0500
committerMike Kasick <mike@kasick.org>2012-12-05 18:54:08 -0500
commitf8c8ad20128889bad3e8e233039d47108b1d7791 (patch)
tree1bb3401a1a225c18c0cb75ab557e7e96e2896400
parentc742ecd8daa7c57d017902a05548788f142591e5 (diff)
downloadpackages_apps_settings-f8c8ad20128889bad3e8e233039d47108b1d7791.zip
packages_apps_settings-f8c8ad20128889bad3e8e233039d47108b1d7791.tar.gz
packages_apps_settings-f8c8ad20128889bad3e8e233039d47108b1d7791.tar.bz2
PowerWidgetUtil: Re-enable LTE button.
- Also use Settings.Global.getInt() for PREFERRED_NETWORK_MODE. Change-Id: I677de6353bf451fe4390ff74f9703b5df3beb39d
-rw-r--r--src/com/android/settings/cyanogenmod/PowerWidget.java2
-rw-r--r--src/com/android/settings/cyanogenmod/PowerWidgetUtil.java7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/settings/cyanogenmod/PowerWidget.java b/src/com/android/settings/cyanogenmod/PowerWidget.java
index 134755e..3dc3f88 100644
--- a/src/com/android/settings/cyanogenmod/PowerWidget.java
+++ b/src/com/android/settings/cyanogenmod/PowerWidget.java
@@ -285,7 +285,7 @@ public class PowerWidget extends SettingsPreferenceFragment implements
int network_state = -99;
try {
- network_state = Settings.Secure.getInt(getActivity()
+ network_state = Settings.Global.getInt(getActivity()
.getApplicationContext().getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE);
} catch (Settings.SettingNotFoundException e) {
diff --git a/src/com/android/settings/cyanogenmod/PowerWidgetUtil.java b/src/com/android/settings/cyanogenmod/PowerWidgetUtil.java
index 9dc70de..ebd743e 100644
--- a/src/com/android/settings/cyanogenmod/PowerWidgetUtil.java
+++ b/src/com/android/settings/cyanogenmod/PowerWidgetUtil.java
@@ -16,7 +16,7 @@
package com.android.settings.cyanogenmod;
-import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
import com.android.settings.R;
import android.content.Context;
@@ -111,13 +111,12 @@ public class PowerWidgetUtil {
BUTTONS.put(BUTTON_MEDIA_NEXT, new PowerWidgetUtil.ButtonInfo(
BUTTON_MEDIA_NEXT, R.string.title_toggle_media_next,
"com.android.systemui:drawable/stat_media_next"));
- /* Disabled until LTE support is re-added
- if(Phone.LTE_ON_CDMA_TRUE == TelephonyManager.getDefault().getLteOnCdmaMode() ||
+ if(PhoneConstants.LTE_ON_CDMA_TRUE == TelephonyManager.getDefault().getLteOnCdmaMode() ||
TelephonyManager.getDefault().getLteOnGsmMode() != 0) {
BUTTONS.put(BUTTON_LTE, new PowerWidgetUtil.ButtonInfo(
BUTTON_LTE, R.string.title_toggle_lte,
"com.android.systemui:drawable/stat_lte_on"));
- }*/
+ }
BUTTONS.put(BUTTON_WIMAX, new PowerWidgetUtil.ButtonInfo(
BUTTON_WIMAX, R.string.title_toggle_wimax,
"com.android.systemui:drawable/stat_wimax_on"));