summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/sound
diff options
context:
space:
mode:
authorFan Zhang <zhfan@google.com>2018-08-28 15:11:40 -0700
committerFan Zhang <zhfan@google.com>2018-08-28 22:13:15 +0000
commit23f8d59d0208c87a759c5a3a7faa8afe4a4e213c (patch)
tree9b84a5fda61d36c7173932adb34d005802e70714 /src/com/android/settings/sound
parent61a909c6624d4ed526f0b462e9272e885f0bf3d9 (diff)
downloadpackages_apps_Settings-23f8d59d0208c87a759c5a3a7faa8afe4a4e213c.tar.gz
packages_apps_Settings-23f8d59d0208c87a759c5a3a7faa8afe4a4e213c.tar.bz2
packages_apps_Settings-23f8d59d0208c87a759c5a3a7faa8afe4a4e213c.zip
Sort imports
Having consistent import order will reduce chance of merge conflict between internal and external master Test: rebuild Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Diffstat (limited to 'src/com/android/settings/sound')
-rw-r--r--src/com/android/settings/sound/AudioSwitchPreferenceController.java8
-rw-r--r--src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java4
-rw-r--r--src/com/android/settings/sound/MediaOutputPreferenceController.java4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index d5e3aff4a4..f77dfcafc7 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -36,6 +36,10 @@ import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.BasePreferenceController;
@@ -56,10 +60,6 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Abstract class for audio switcher controller to notify subclass
* updating the current status of switcher entry. Subclasses must overwrite
diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 348d7d3d0f..0b50f5f2d7 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -21,13 +21,13 @@ import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.HeadsetProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
-import androidx.preference.Preference;
-
/**
* This class allows switching between HFP-connected & HAP-connected BT devices
* while in on-call state.
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index dba82ebf4a..8704243582 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -24,13 +24,13 @@ import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.media.AudioManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
-import androidx.preference.Preference;
-
/**
* This class which allows switching between A2dp-connected & HAP-connected BT devices.
* A few conditions will disable this switcher: