oppo-common: update utils imports

TODO: switch to classic android.preference imports for now
in KeyHandler to be revisited later

Change-Id: I18166558a8cbcdc7cfcd3828cbfb5e89b6e72278

4 files changed, 14 insertions, 14 deletions

diff --git a/DeviceHandler/src/com/slim/device/KeyHandler.java b/DeviceHandler/src/com/slim/device/KeyHandler.java
index dca57b8..0ed1042 100644
--- a/DeviceHandler/src/com/slim/device/KeyHandler.java
+++ b/DeviceHandler/src/com/slim/device/KeyHandler.java
@@ -45,8 +45,8 @@ import com.slim.device.settings.ScreenOffGesture;
 
 import com.android.internal.os.DeviceKeyHandler;
 import com.android.internal.util.ArrayUtils;
-import com.android.internal.util.gzosp.ActionConstants;
-import com.android.internal.util.gzosp.Action;
+import com.android.internal.util.aicp.ActionConstants;
+import com.android.internal.util.aicp.Action;
 
 import java.util.HashSet;
 
diff --git a/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java b/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java
index 7846792..c00bde2 100644
--- a/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java
+++ b/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java
@@ -27,20 +27,20 @@ import android.content.res.Resources;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.android.internal.util.gzosp.AppHelper;
-import com.android.internal.util.gzosp.ActionConstants;
-import com.android.internal.util.gzosp.DeviceUtils;
-import com.android.internal.util.gzosp.DeviceUtils.FilteredDeviceFeaturesArray;
+import com.android.internal.util.aicp.AppHelper;
+import com.android.internal.util.aicp.ActionConstants;
+import com.android.internal.util.aicp.DeviceUtils;
+import com.android.internal.util.aicp.DeviceUtils.FilteredDeviceFeaturesArray;
 
 import com.slim.device.KernelControl;
 import com.slim.device.R;
diff --git a/DeviceHandler/src/com/slim/device/settings/SliderSettings.java b/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
index ec16387..00ba1ec 100644
--- a/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
+++ b/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
@@ -18,10 +18,10 @@ package com.slim.device.settings;
 
 import android.app.ActionBar;
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceActivity;
 import androidx.preference.SwitchPreference;
 import android.view.MenuItem;
 
diff --git a/DeviceHandler/src/com/slim/device/util/ShortcutPickerHelper.java b/DeviceHandler/src/com/slim/device/util/ShortcutPickerHelper.java
index 791e746..97277dd 100644
--- a/DeviceHandler/src/com/slim/device/util/ShortcutPickerHelper.java
+++ b/DeviceHandler/src/com/slim/device/util/ShortcutPickerHelper.java
@@ -30,7 +30,7 @@ import android.util.Log;
 
 import com.slim.device.R;
 
-import com.android.internal.util.gzosp.AppHelper;
+import com.android.internal.util.aicp.AppHelper;
 
 import java.util.ArrayList;