Merge "Fix QS FBE-ness" into nyc-dev
diff --git a/core/java/android/service/quicksettings/IQSService.aidl b/core/java/android/service/quicksettings/IQSService.aidl
index 1d90505..5434e2e 100644
--- a/core/java/android/service/quicksettings/IQSService.aidl
+++ b/core/java/android/service/quicksettings/IQSService.aidl
@@ -34,4 +34,5 @@
void startUnlockAndRun(in Tile tile);
void onDialogHidden(in Tile tile);
+ void onStartSuccessful(in Tile tile);
}
diff --git a/core/java/android/service/quicksettings/Tile.java b/core/java/android/service/quicksettings/Tile.java
index 85f1955..3d7d53e 100644
--- a/core/java/android/service/quicksettings/Tile.java
+++ b/core/java/android/service/quicksettings/Tile.java
@@ -37,8 +37,6 @@
private static final String TAG = "Tile";
/**
- * This is the default state of any tile, until updated by the {@link TileService}.
- * <p>
* An unavailable state indicates that for some reason this tile is not currently
* available to the user for some reason, and will have no click action. The tile's
* icon will be tinted differently to reflect this state.
@@ -57,7 +55,7 @@
/**
* This represents a tile that is currently active. (e.g. wifi is connected, bluetooth is on,
- * cast is casting).
+ * cast is casting). This is the default state.
*/
public static final int STATE_ACTIVE = 2;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
index 57db3a6..03c2a0b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -17,6 +17,7 @@
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.ColorDrawable;
+import android.os.Handler;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.GridLayoutManager.SpanSizeLookup;
import android.support.v7.widget.RecyclerView;
@@ -51,6 +52,7 @@
private final Context mContext;
+ private final Handler mHandler = new Handler();
private final List<TileInfo> mTiles = new ArrayList<>();
private final ItemTouchHelper mItemTouchHelper;
private int mDividerIndex;
@@ -262,7 +264,12 @@
mCurrentDrag = (Holder) viewHolder;
mCurrentDrag.startDrag();
}
- notifyItemChanged(mDividerIndex);
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ notifyItemChanged(mDividerIndex);
+ }
+ });
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
index db686a8..9156f3a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
@@ -75,7 +75,8 @@
mUser = ActivityManager.getCurrentUser();
try {
PackageManager pm = mContext.getPackageManager();
- ServiceInfo info = pm.getServiceInfo(mComponent, 0);
+ ServiceInfo info = pm.getServiceInfo(mComponent,
+ PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
mTile.setIcon(android.graphics.drawable.Icon
.createWithResource(mComponent.getPackageName(), info.icon));
mTile.setLabel(info.loadLabel(pm));
@@ -88,6 +89,17 @@
}
}
+ @Override
+ public boolean isAvailable() {
+ try {
+ ServiceInfo info = mContext.getPackageManager().getServiceInfo(mComponent,
+ PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
public int getUser() {
return mUser;
}
@@ -211,11 +223,15 @@
@Override
protected void handleUpdateState(State state, Object arg) {
Drawable drawable = mTile.getIcon().loadDrawable(mContext);
- int color = mContext.getColor(getColor(mTile.getState()));
+ int tileState = mTile.getState();
+ if (mServiceManager.hasPendingBind()) {
+ tileState = Tile.STATE_UNAVAILABLE;
+ }
+ int color = mContext.getColor(getColor(tileState));
drawable.setTint(color);
state.icon = new DrawableIcon(drawable);
state.label = mTile.getLabel();
- if (mTile.getState() == Tile.STATE_UNAVAILABLE) {
+ if (tileState == Tile.STATE_UNAVAILABLE) {
state.label = new SpannableStringBuilder().append(state.label,
new ForegroundColorSpan(color),
SpannableStringBuilder.SPAN_INCLUSIVE_INCLUSIVE);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
index 2aad161..8910d44 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
@@ -249,6 +249,8 @@
filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
filter.addDataScheme("package");
mContext.registerReceiverAsUser(this, mUser, filter, null, mHandler);
+ filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);
+ mContext.registerReceiverAsUser(this, mUser, filter, null, mHandler);
mReceiverRegistered = true;
}
@@ -261,10 +263,12 @@
@Override
public void onReceive(Context context, Intent intent) {
if (DEBUG) Log.d(TAG, "onReceive: " + intent);
- Uri data = intent.getData();
- String pkgName = data.getEncodedSchemeSpecificPart();
- if (!Objects.equal(pkgName, mIntent.getComponent().getPackageName())) {
- return;
+ if (!Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) {
+ Uri data = intent.getData();
+ String pkgName = data.getEncodedSchemeSpecificPart();
+ if (!Objects.equal(pkgName, mIntent.getComponent().getPackageName())) {
+ return;
+ }
}
stopPackageListening();
if (mBound) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
index 5cf1e21..664ddd6 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java
@@ -53,6 +53,9 @@
private long mLastUpdate;
private int mType;
private boolean mShowingDialog;
+ // Whether we have a pending bind going out to the service without a response yet.
+ // This defaults to true to ensure tiles start out unavailable.
+ private boolean mPendingBind = true;
TileServiceManager(TileServices tileServices, Handler handler, ComponentName component) {
this(tileServices, handler, new TileLifecycleManager(handler,
@@ -132,11 +135,20 @@
}
}
+ public boolean hasPendingBind() {
+ return mPendingBind;
+ }
+
+ public void clearPendingBind() {
+ mPendingBind = false;
+ }
+
private void bindService() {
if (mBound) {
Log.e(TAG, "Service already bound");
return;
}
+ mPendingBind = true;
mBound = true;
mJustBound = true;
mHandler.postDelayed(mJustBoundOver, MIN_BIND_TIME);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
index bfa4a32..5bb2a35 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
@@ -182,7 +182,9 @@
CustomTile customTile = getTileForComponent(componentName);
if (customTile != null) {
synchronized (mServices) {
- mServices.get(customTile).setLastUpdate(System.currentTimeMillis());
+ final TileServiceManager tileServiceManager = mServices.get(customTile);
+ tileServiceManager.clearPendingBind();
+ tileServiceManager.setLastUpdate(System.currentTimeMillis());
}
customTile.updateState(tile);
customTile.refreshState();
@@ -190,6 +192,20 @@
}
@Override
+ public void onStartSuccessful(Tile tile) {
+ ComponentName componentName = tile.getComponentName();
+ verifyCaller(componentName.getPackageName());
+ CustomTile customTile = getTileForComponent(componentName);
+ if (customTile != null) {
+ synchronized (mServices) {
+ final TileServiceManager tileServiceManager = mServices.get(customTile);
+ tileServiceManager.clearPendingBind();
+ }
+ customTile.refreshState();
+ }
+ }
+
+ @Override
public void onShowDialog(Tile tile) {
ComponentName componentName = tile.getComponentName();
verifyCaller(componentName.getPackageName());