Settings: Point to classes within cmsdk.

Change-Id: I19a767e90d20bd6a8b4709416779590aabd9858f

8 files changed, 25 insertions, 28 deletions

diff --git a/src/com/android/settings/profiles/SetupActionsFragment.java b/src/com/android/settings/profiles/SetupActionsFragment.java
index 89b84bf..7285c94 100644
--- a/src/com/android/settings/profiles/SetupActionsFragment.java
+++ b/src/com/android/settings/profiles/SetupActionsFragment.java
@@ -16,14 +16,14 @@
 package com.android.settings.profiles;
 
 import android.app.Activity;
-import android.app.AirplaneModeSettings;
+import cyanogenmod.profiles.AirplaneModeSettings;
 import android.app.AlertDialog;
-import android.app.BrightnessSettings;
-import android.app.ConnectionSettings;
+import cyanogenmod.profiles.BrightnessSettings;
+import cyanogenmod.profiles.ConnectionSettings;
 import android.app.Dialog;
 import android.app.NotificationGroup;
-import android.app.RingModeSettings;
-import android.app.StreamSettings;
+import cyanogenmod.profiles.RingModeSettings;
+import cyanogenmod.profiles.StreamSettings;
 import android.bluetooth.BluetoothAdapter;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -86,15 +86,15 @@ import com.android.settings.Utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_2G3G4G;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_BLUETOOTH;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_GPS;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_MOBILEDATA;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_NFC;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_SYNC;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_WIFI;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_WIFIAP;
-import static android.app.ConnectionSettings.PROFILE_CONNECTION_WIMAX;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_2G3G4G;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_BLUETOOTH;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_GPS;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_MOBILEDATA;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_NFC;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_SYNC;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_WIFI;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_WIFIAP;
+import static cyanogenmod.profiles.ConnectionSettings.PROFILE_CONNECTION_WIMAX;
 
 public class SetupActionsFragment extends SettingsPreferenceFragment
         implements AdapterView.OnItemClickListener {
diff --git a/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java b/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
index ed589d5..ecacc1b 100644
--- a/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
@@ -15,8 +15,7 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import android.app.AirplaneModeSettings;
-import android.app.RingModeSettings;
+import cyanogenmod.profiles.AirplaneModeSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/settings/profiles/actions/item/BrightnessItem.java b/src/com/android/settings/profiles/actions/item/BrightnessItem.java
index 2792eff..223abda 100644
--- a/src/com/android/settings/profiles/actions/item/BrightnessItem.java
+++ b/src/com/android/settings/profiles/actions/item/BrightnessItem.java
@@ -15,7 +15,7 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import android.app.BrightnessSettings;
+import cyanogenmod.profiles.BrightnessSettings;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
index 7ec5553..1ad8573 100644
--- a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
+++ b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
@@ -15,7 +15,7 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import android.app.ConnectionSettings;
+import cyanogenmod.profiles.ConnectionSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/settings/profiles/actions/item/RingModeItem.java b/src/com/android/settings/profiles/actions/item/RingModeItem.java
index 1874909..f1c57a3 100644
--- a/src/com/android/settings/profiles/actions/item/RingModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/RingModeItem.java
@@ -15,10 +15,7 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import android.app.AlertDialog;
-import android.app.RingModeSettings;
-import android.content.Context;
-import android.content.DialogInterface;
+import cyanogenmod.profiles.RingModeSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
index 25db5e0..23db18d 100644
--- a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
+++ b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
@@ -15,7 +15,7 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import android.app.StreamSettings;
+import cyanogenmod.profiles.StreamSettings;
 import android.content.Context;
 import android.media.AudioManager;
 import android.view.LayoutInflater;
diff --git a/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java b/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java
index 834a5fc..b3478e8 100644
--- a/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java
+++ b/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java
@@ -127,13 +127,13 @@ public class BluetoothTriggerFragment extends ListFragment {
 
         entries = new String[triggers.size()];
         final int[] valueInts = new int[triggers.size()];
-        int currentTrigger = mProfile.getTrigger(triggerType, triggerId);
+        int currentTriggerState = mProfile.getTriggerState(triggerType, triggerId);
         int currentItem = -1;
         for (int i = 0; i < triggers.size(); i++) {
             Trigger t = triggers.get(i);
             entries[i] = t.name;
             valueInts[i] = t.value;
-            if (valueInts[i] == currentTrigger) {
+            if (valueInts[i] == currentTriggerState) {
                 currentItem = i;
             }
         }
diff --git a/src/com/android/settings/profiles/triggers/WifiTriggerFragment.java b/src/com/android/settings/profiles/triggers/WifiTriggerFragment.java
index 5ec1996..dc91cec 100644
--- a/src/com/android/settings/profiles/triggers/WifiTriggerFragment.java
+++ b/src/com/android/settings/profiles/triggers/WifiTriggerFragment.java
@@ -121,13 +121,13 @@ public class WifiTriggerFragment extends ListFragment {
 
         entries = new String[triggers.size()];
         final int[] valueInts = new int[triggers.size()];
-        int currentTrigger = mProfile.getTrigger(triggerType, triggerId);
+        int currentTriggerState = mProfile.getTriggerState(triggerType, triggerId);
         int currentItem = -1;
         for (int i = 0; i < triggers.size(); i++) {
             Trigger t = triggers.get(i);
             entries[i] = t.name;
             valueInts[i] = t.value;
-            if (valueInts[i] == currentTrigger) {
+            if (valueInts[i] == currentTriggerState) {
                 currentItem = i;
             }
         }
@@ -172,7 +172,8 @@ public class WifiTriggerFragment extends ListFragment {
         if (configs != null) {
             for (WifiConfiguration config : configs) {
                 WifiTrigger accessPoint = new WifiTrigger(config);
-                int state = mProfile.getTrigger(Profile.TriggerType.WIFI, accessPoint.getSSID());
+                int state = mProfile.getTriggerState(
+                        Profile.TriggerType.WIFI, accessPoint.getSSID());
                 initPreference(accessPoint, state, res, R.drawable.ic_wifi_signal_4_teal);
                 mTriggers.add(accessPoint);
             }