diff options
| -rw-r--r-- | src/com/android/dialer/incall/CallMethodStatusReceiver.java | 8 | ||||
| -rw-r--r-- | src/com/android/dialer/settings/DialerSettingsActivity.java | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/dialer/incall/CallMethodStatusReceiver.java b/src/com/android/dialer/incall/CallMethodStatusReceiver.java index ffdc74ea0..a5af807fe 100644 --- a/src/com/android/dialer/incall/CallMethodStatusReceiver.java +++ b/src/com/android/dialer/incall/CallMethodStatusReceiver.java @@ -7,6 +7,8 @@ import android.content.SharedPreferences; import android.os.Bundle; import com.android.dialer.DialtactsActivity; import com.android.phone.common.incall.CallMethodUtils; +import com.cyanogen.ambient.plugin.PluginStatus; +import com.cyanogen.ambient.plugin.PluginStatusConstants; public class CallMethodStatusReceiver extends BroadcastReceiver { @@ -18,9 +20,9 @@ public class CallMethodStatusReceiver extends BroadcastReceiver { .getSharedPreferences(DialtactsActivity.SHARED_PREFS_NAME, Context.MODE_PRIVATE); if (b != null) { - String pluginName = b.getString(com.cyanogen.ambient.incall.PluginStatusConstants.EXTRA_PLUGIN_COMPONENT); - int pluginStatus = b.getInt(com.cyanogen.ambient.incall.PluginStatusConstants.EXTRA_PLUGIN_STATUS); - if (pluginStatus == com.cyanogen.ambient.incall.InCallPluginStatus.ENABLED) { + String pluginName = b.getString(PluginStatusConstants.EXTRA_PLUGIN_COMPONENT); + int pluginStatus = b.getInt(PluginStatusConstants.EXTRA_PLUGIN_STATUS); + if (pluginStatus == PluginStatus.ENABLED) { String lastProviderEnabled = preferences.getString(CallMethodUtils.PREF_LAST_ENABLED_PROVIDER, null); diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index 7d79c6636..7d1adc202 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -18,7 +18,7 @@ import com.cyanogen.ambient.callerinfo.util.ProviderInfo; import com.cyanogen.ambient.common.api.AmbientApiClient; import com.cyanogen.ambient.common.api.PendingResult; import com.cyanogen.ambient.common.api.ResultCallback; -import com.cyanogen.ambient.incall.InCallPluginStatus; +import com.cyanogen.ambient.plugin.PluginStatus; import com.cyanogen.ambient.incall.util.InCallHelper; import com.google.common.collect.Lists; @@ -163,8 +163,8 @@ public class DialerSettingsActivity extends PreferenceActivity { if (mCallProviders != null) { for (CallMethodInfo cmi : mCallProviders) { - if (cmi.mStatus == InCallPluginStatus.ENABLED || cmi.mStatus == - InCallPluginStatus.DISABLED) { + if (cmi.mStatus == PluginStatus.ENABLED || cmi.mStatus == + PluginStatus.DISABLED) { Header thing = new Header(); Bundle b = new Bundle(); b.putString(COMPONENT_NAME, cmi.mComponent.flattenToShortString()); @@ -174,7 +174,7 @@ public class DialerSettingsActivity extends PreferenceActivity { thing.summary = cmi.mSummary; target.add(thing); - if (cmi.mStatus == InCallPluginStatus.ENABLED && cmi.mSettingsIntent != null) { + if (cmi.mStatus == PluginStatus.ENABLED && cmi.mSettingsIntent != null) { thing = new Header(); thing.title = getResources().getString(R.string.incall_plugin_settings, cmi @@ -296,7 +296,7 @@ public class DialerSettingsActivity extends PreferenceActivity { Header header = ((Header) switchButton.getTag()); if (header.extras != null && header.extras.containsKey(COMPONENT_NAME)) { setCheckedStateWithoutTriggeringListener(switchButton, - header.extras.getInt(COMPONENT_STATUS) == InCallPluginStatus.ENABLED); + header.extras.getInt(COMPONENT_STATUS) == PluginStatus.ENABLED); } } @@ -431,7 +431,7 @@ public class DialerSettingsActivity extends PreferenceActivity { // by the ambient core package } }, componentName); - asyncTask.execute(isEnabled ? InCallPluginStatus.ENABLED : InCallPluginStatus.DISABLED); + asyncTask.execute(isEnabled ? PluginStatus.ENABLED : PluginStatus.DISABLED); extras.putBoolean(COMPONENT_STATUS, isEnabled); } } |