diff options
author | Julian Kast <julian@livio.com> | 2020-08-10 19:35:10 -0400 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2020-08-10 19:35:10 -0400 |
commit | 3e9f90212e713f85369e6a11f1d15abf3b966bdf (patch) | |
tree | 6053750e7c5b7727ddba917a4dc7601008529656 | |
parent | 5a2821961cde6439178e00ff8b959cca48e45bb3 (diff) | |
download | sdl_android-3e9f90212e713f85369e6a11f1d15abf3b966bdf.tar.gz |
Update imports to androidX
56 files changed, 68 insertions, 68 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java index 2b0b25931..42dc6a165 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -36,8 +36,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.smartdevicelink.managers.audio.AudioStreamManager; import com.smartdevicelink.managers.file.FileManager; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java index cba0d212b..04fe41c97 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java @@ -36,8 +36,8 @@ import android.media.MediaCodec; import android.media.MediaFormat;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;
import com.smartdevicelink.util.DebugTool;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java index fb5298a5c..ce2d3c49e 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java @@ -35,7 +35,7 @@ import android.content.Context; import android.media.MediaCodec; import android.media.MediaFormat; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType; import com.smartdevicelink.util.DebugTool; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java index 3e8c55772..2656b4b58 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java @@ -38,8 +38,8 @@ import android.net.Uri; import android.os.Build;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
import com.smartdevicelink.SdlConnection.SdlSession;
import com.smartdevicelink.managers.CompletionListener;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java index 3831257a6..53e3d64f0 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java @@ -38,7 +38,7 @@ import android.media.MediaExtractor; import android.media.MediaFormat;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;
import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java index a29ce1536..bdd21ba45 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java @@ -35,7 +35,7 @@ package com.smartdevicelink.managers.file; import android.content.Context; import android.content.res.Resources; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.filetypes.SdlFile; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java index 5f14cb2ed..d0e46f7e5 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java @@ -33,7 +33,7 @@ package com.smartdevicelink.managers.file.filetypes; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.rpc.Image; import com.smartdevicelink.proxy.rpc.enums.FileType; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java index 5d7e73f5c..ac8942dcb 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java @@ -33,7 +33,7 @@ package com.smartdevicelink.managers.file.filetypes; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.rpc.enums.FileType; import com.smartdevicelink.proxy.rpc.enums.StaticIconName; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java index 99723b456..ae7a0886e 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.lifecycle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.ServiceEncryptionListener; import com.smartdevicelink.protocol.enums.SessionType; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java index 49e25b242..8304405ea 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java @@ -34,7 +34,7 @@ package com.smartdevicelink.managers.lifecycle; import android.app.Service; import android.content.Context; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; import com.smartdevicelink.SdlConnection.SdlSession; import com.smartdevicelink.exception.SdlException; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java index 6769db0fc..8fe3286ba 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.lockscreen; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java index 7efa183b7..e3a85bb1b 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.permission; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java index 7975bb5f2..5065294a9 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java index 146343677..b7a2e2958 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java index f38cf79d0..b5dafa5fd 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java @@ -1,6 +1,6 @@ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.interfaces.ISdl; /** diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java index d3d594b76..82e9a5e01 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.R; import com.smartdevicelink.managers.file.FileManager; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java index f470b8a68..32ff8c0eb 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen.choiceset; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java index c443abfc6..9825900e9 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java @@ -32,7 +32,7 @@ package com.smartdevicelink.protocol; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.transport.MultiplexTransportConfig; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index 7c9915456..7763f7cfd 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -41,7 +41,7 @@ import android.os.Handler; import android.os.Looper;
import android.os.SystemClock;
import android.os.TransactionTooLargeException;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
import android.util.SparseArray;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java index 5b67fa444..01251f61f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java @@ -29,7 +29,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.support.annotation.RequiresPermission; +import androidx.annotation.RequiresPermission; import com.smartdevicelink.protocol.SdlPacket; import com.smartdevicelink.transport.enums.TransportType; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java index a9aca1ff4..f86caa699 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java @@ -47,7 +47,7 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.util.AndroidTools; import com.smartdevicelink.util.DebugTool; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index 24d5ec850..d1ddcbb08 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -70,8 +70,8 @@ import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.Parcelable; import android.os.RemoteException; -import android.support.annotation.NonNull; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; import android.util.AndroidRuntimeException; import android.util.SparseArray; import android.util.SparseIntArray; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java index 488a117b4..b9bd8bb12 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java @@ -39,7 +39,7 @@ import android.content.SharedPreferences; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.transport.MultiplexBaseTransport; import com.smartdevicelink.transport.MultiplexBluetoothTransport; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java index 3e8a37661..84c21f761 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java @@ -43,7 +43,7 @@ import android.content.IntentFilter; import android.media.AudioDeviceInfo; import android.media.AudioManager; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java index cac7d0923..5dc9a3e75 100644 --- a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.FileManagerConfig; diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java index 10477d31a..74aebda5a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.transport.utl.TransportRecord; diff --git a/base/src/main/java/com/smartdevicelink/managers/ServiceEncryptionListener.java b/base/src/main/java/com/smartdevicelink/managers/ServiceEncryptionListener.java index fedefdec2..36883a23c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/ServiceEncryptionListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/ServiceEncryptionListener.java @@ -1,7 +1,7 @@ package com.smartdevicelink.managers; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.smartdevicelink.protocol.enums.SessionType; diff --git a/base/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java b/base/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java index 6025167f5..f828ff58e 100644 --- a/base/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java +++ b/base/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java b/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java index e3e4d325c..e4c191308 100644 --- a/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.audio; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java index 30a9f92bc..c08cb17e0 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java @@ -33,7 +33,7 @@ package com.smartdevicelink.managers.file; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java index 33bb0a67a..a458ae048 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.lifecycle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.SdlConnection.SdlSession; import com.smartdevicelink.managers.ServiceEncryptionListener; import com.smartdevicelink.protocol.enums.FunctionID; diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java index 765944492..64a919206 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -32,8 +32,8 @@ package com.smartdevicelink.managers.lifecycle; -import android.support.annotation.NonNull; -import android.support.annotation.RestrictTo; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.SdlConnection.ISdlConnectionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdate.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdate.java index 031918d3b..fa85a459b 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdate.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdate.java @@ -35,7 +35,7 @@ package com.smartdevicelink.managers.lifecycle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.smartdevicelink.proxy.rpc.TTSChunk; diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java index 5314d0fd5..669a34a7a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java @@ -31,8 +31,8 @@ */ package com.smartdevicelink.managers.permission; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java b/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java index 160d94e83..dd600fc6d 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.permission; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.protocol.enums.FunctionID; diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java index 6a3d2ab0c..cd7a8f736 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.permission; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.protocol.enums.FunctionID; diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java index 740aca7b6..018e038c9 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.permission; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; import java.util.UUID; diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java index 2d4950e46..8f44ac0f6 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.permission; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.protocol.enums.FunctionID; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java index 7b6ee1c30..80daf4d2e 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -31,8 +31,8 @@ */ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java index 882e84d49..da2ed1173 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.livio.taskmaster.Queue; import com.livio.taskmaster.Task; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java index 7d9bf26e1..ba9e8aa53 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java @@ -1,6 +1,6 @@ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java index 6245320f4..654d03f2f 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java index 76c2622a6..7b5befb3d 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.rpc.OnButtonEvent; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java index a2272c461..9c6a7d2d4 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.screen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.rpc.SoftButton; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java index 9743790b6..7de4f3434 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java @@ -34,8 +34,8 @@ package com.smartdevicelink.managers.screen.choiceset; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.livio.taskmaster.Queue; import com.livio.taskmaster.Task; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java index eb8533cd0..f6995279c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen.choiceset; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java index 7009c89b1..6585ad810 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java @@ -32,8 +32,8 @@ package com.smartdevicelink.managers.screen.choiceset; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.smartdevicelink.proxy.TTSChunkFactory; import com.smartdevicelink.proxy.rpc.KeyboardProperties; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java index de68e1ffc..ffce35694 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java @@ -35,7 +35,7 @@ package com.smartdevicelink.managers.screen.choiceset; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java index b244389d3..0fcfc2c4c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen.menu; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java index 8004413b7..c615408fd 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java @@ -32,7 +32,7 @@ package com.smartdevicelink.managers.screen.menu; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java index 6f69993ee..20cc44d38 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java @@ -32,8 +32,8 @@ package com.smartdevicelink.managers.screen.menu; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.rpc.enums.MenuLayout; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java index 13e1f92e2..59bf7974f 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java @@ -35,7 +35,7 @@ package com.smartdevicelink.managers.screen.menu; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.rpc.enums.MenuLayout; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommand.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommand.java index 8227b3087..aa94dd533 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommand.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommand.java @@ -32,8 +32,8 @@ package com.smartdevicelink.managers.screen.menu; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.List; diff --git a/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java b/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java index da8c35af3..d5a24766f 100644 --- a/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.video; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.proxy.interfaces.ISdl; diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java index 1468f9477..1019961a1 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java +++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.protocol; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.exception.SdlExceptionCause; diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java index a3e1da573..a4183f01a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java +++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java @@ -1,6 +1,6 @@ package com.smartdevicelink.proxy.interfaces; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.protocol.enums.FunctionID; |