summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrettyWhite <geekman3454@protonmail.com>2018-10-05 10:35:10 -0400
committerBrettyWhite <geekman3454@protonmail.com>2018-10-05 10:35:10 -0400
commit7cf673a66fa128bdbc4452790aaa81a8f140703a (patch)
tree55ebc97d449d442acc2f3195f01bf9d081ed7a94
parentcd19e4687a759d62b06f5eff76617a773cae9c57 (diff)
downloadsdl_android-7cf673a66fa128bdbc4452790aaa81a8f140703a.tar.gz
use fully qualified class names for lifecycle lib
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java20
1 files changed, 8 insertions, 12 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index 6b6998474..4bd2f229f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
@@ -1,9 +1,5 @@
package com.smartdevicelink.managers.lockscreen;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleObserver;
-import android.arch.lifecycle.OnLifecycleEvent;
-import android.arch.lifecycle.ProcessLifecycleOwner;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -45,7 +41,7 @@ public class LockScreenManager extends BaseSubManager {
private String deviceIconUrl;
private boolean driverDistStatus;
private volatile boolean isApplicationForegrounded;
- private LifecycleObserver lifecycleObserver;
+ private android.arch.lifecycle.LifecycleObserver lifecycleObserver;
protected boolean lockScreenEnabled, deviceLogoEnabled;
protected int lockScreenIcon, lockScreenColor, customView;
protected Bitmap deviceLogo;
@@ -92,8 +88,8 @@ public class LockScreenManager extends BaseSubManager {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
try {
- if (ProcessLifecycleOwner.get() != null && lifecycleObserver != null) {
- ProcessLifecycleOwner.get().getLifecycle().removeObserver(lifecycleObserver);
+ if (android.arch.lifecycle.ProcessLifecycleOwner.get() != null && lifecycleObserver != null) {
+ android.arch.lifecycle.ProcessLifecycleOwner.get().getLifecycle().removeObserver(lifecycleObserver);
}
} catch (Exception e) {
e.printStackTrace();
@@ -176,21 +172,21 @@ public class LockScreenManager extends BaseSubManager {
// Set up listener for Application Foreground / Background events
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
try {
- lifecycleObserver = new LifecycleObserver() {
- @OnLifecycleEvent(Lifecycle.Event.ON_START)
+ lifecycleObserver = new android.arch.lifecycle.LifecycleObserver() {
+ @android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_START)
public void onMoveToForeground() {
isApplicationForegrounded = true;
launchLockScreenActivity();
}
- @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+ @android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_STOP)
public void onMoveToBackground() {
isApplicationForegrounded = false;
}
};
- if (ProcessLifecycleOwner.get() != null) {
- ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleObserver);
+ if (android.arch.lifecycle.ProcessLifecycleOwner.get() != null) {
+ android.arch.lifecycle.ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleObserver);
}
} catch (Exception e) {
e.printStackTrace();