Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
This commit is contained in:
@@ -35,6 +35,7 @@ import android.os.AsyncTask;
|
||||
import android.os.Handler;
|
||||
import android.os.SystemClock;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
import android.util.MutableBoolean;
|
||||
import android.view.Display;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -281,6 +282,12 @@ public class Recents extends SystemUI
|
||||
@ProxyFromPrimaryToCurrentUser
|
||||
@Override
|
||||
public void showRecents(boolean triggeredFromAltTab, View statusBarView) {
|
||||
// Ensure the device has been provisioned before allowing the user to interact with
|
||||
// recents
|
||||
if (!isDeviceProvisioned()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mSystemServicesProxy.isForegroundUserOwner()) {
|
||||
showRecentsInternal(triggeredFromAltTab);
|
||||
} else {
|
||||
@@ -305,6 +312,12 @@ public class Recents extends SystemUI
|
||||
@ProxyFromPrimaryToCurrentUser
|
||||
@Override
|
||||
public void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
|
||||
// Ensure the device has been provisioned before allowing the user to interact with
|
||||
// recents
|
||||
if (!isDeviceProvisioned()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mSystemServicesProxy.isForegroundUserOwner()) {
|
||||
hideRecentsInternal(triggeredFromAltTab, triggeredFromHomeKey);
|
||||
} else {
|
||||
@@ -331,6 +344,12 @@ public class Recents extends SystemUI
|
||||
@ProxyFromPrimaryToCurrentUser
|
||||
@Override
|
||||
public void toggleRecents(Display display, int layoutDirection, View statusBarView) {
|
||||
// Ensure the device has been provisioned before allowing the user to interact with
|
||||
// recents
|
||||
if (!isDeviceProvisioned()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mSystemServicesProxy.isForegroundUserOwner()) {
|
||||
toggleRecentsInternal();
|
||||
} else {
|
||||
@@ -354,6 +373,12 @@ public class Recents extends SystemUI
|
||||
@ProxyFromPrimaryToCurrentUser
|
||||
@Override
|
||||
public void preloadRecents() {
|
||||
// Ensure the device has been provisioned before allowing the user to interact with
|
||||
// recents
|
||||
if (!isDeviceProvisioned()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mSystemServicesProxy.isForegroundUserOwner()) {
|
||||
preloadRecentsInternal();
|
||||
} else {
|
||||
@@ -470,6 +495,12 @@ public class Recents extends SystemUI
|
||||
|
||||
@Override
|
||||
public void showNextAffiliatedTask() {
|
||||
// Ensure the device has been provisioned before allowing the user to interact with
|
||||
// recents
|
||||
if (!isDeviceProvisioned()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Keep track of when the affiliated task is triggered
|
||||
MetricsLogger.count(mContext, "overview_affiliated_task_next", 1);
|
||||
showRelativeAffiliatedTask(true);
|
||||
@@ -477,6 +508,12 @@ public class Recents extends SystemUI
|
||||
|
||||
@Override
|
||||
public void showPrevAffiliatedTask() {
|
||||
// Ensure the device has been provisioned before allowing the user to interact with
|
||||
// recents
|
||||
if (!isDeviceProvisioned()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Keep track of when the affiliated task is triggered
|
||||
MetricsLogger.count(mContext, "overview_affiliated_task_prev", 1);
|
||||
showRelativeAffiliatedTask(false);
|
||||
@@ -888,6 +925,14 @@ public class Recents extends SystemUI
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return whether this device is provisioned.
|
||||
*/
|
||||
private boolean isDeviceProvisioned() {
|
||||
return Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.DEVICE_PROVISIONED, 0) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the preloaded load plan and invalidates it.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user