Merge "Smartspace - Do not listen for user changes" into sc-dev
This commit is contained in:
@@ -25,7 +25,6 @@ import android.app.smartspace.SmartspaceConfig;
|
|||||||
import android.app.smartspace.SmartspaceManager;
|
import android.app.smartspace.SmartspaceManager;
|
||||||
import android.app.smartspace.SmartspaceSession;
|
import android.app.smartspace.SmartspaceSession;
|
||||||
import android.app.smartspace.SmartspaceTarget;
|
import android.app.smartspace.SmartspaceTarget;
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.UserInfo;
|
import android.content.pm.UserInfo;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
@@ -112,7 +111,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
|
|||||||
private boolean mShowSensitiveContentForCurrentUser;
|
private boolean mShowSensitiveContentForCurrentUser;
|
||||||
private boolean mShowSensitiveContentForManagedUser;
|
private boolean mShowSensitiveContentForManagedUser;
|
||||||
private UserHandle mManagedUserHandle;
|
private UserHandle mManagedUserHandle;
|
||||||
private UserTracker.Callback mUserTrackerCallback;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Listener for changes to the color palette.
|
* Listener for changes to the color palette.
|
||||||
@@ -294,13 +292,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
mUserTrackerCallback = new UserTracker.Callback() {
|
|
||||||
public void onUserChanged(int newUser, Context userContext) {
|
|
||||||
reloadSmartspace();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
mUserTracker.addCallback(mUserTrackerCallback, mUiExecutor);
|
|
||||||
|
|
||||||
getContext().getContentResolver().registerContentObserver(
|
getContext().getContentResolver().registerContentObserver(
|
||||||
Settings.Secure.getUriFor(
|
Settings.Secure.getUriFor(
|
||||||
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),
|
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),
|
||||||
@@ -376,10 +367,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
|
|||||||
if (mSettingsObserver != null) {
|
if (mSettingsObserver != null) {
|
||||||
getContext().getContentResolver().unregisterContentObserver(mSettingsObserver);
|
getContext().getContentResolver().unregisterContentObserver(mSettingsObserver);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mUserTrackerCallback != null) {
|
|
||||||
mUserTracker.removeCallback(mUserTrackerCallback);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user