Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-22 16:47:30 +00:00
committed by Android (Google) Code Review
parent 4001d7b6c4 8753e184f9
commit 126088536d
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/service/quicksettings/IQSService.aidl
View File

@@ -23,6 +23,7 @@ import android.service.quicksettings.Tile;
* @hide
*/
interface IQSService {
Tile getTile(in ComponentName component);
void updateQsTile(in Tile tile);
void updateStatusIcon(in Tile tile, in Icon icon,
String contentDescription);

23
core/java/android/service/quicksettings/TileService.java
View File

@@ -120,11 +120,6 @@ public class TileService extends Service {
*/
public static final String EXTRA_SERVICE = "service";
/**
* @hide
*/
public static final String EXTRA_TILE = "tile";
/**
* @hide
*/
@@ -315,9 +310,16 @@ public class TileService extends Service {
@Override
public IBinder onBind(Intent intent) {
mTile = intent.getParcelableExtra(EXTRA_TILE);
mService = IQSService.Stub.asInterface(intent.getIBinderExtra(EXTRA_SERVICE));
mTile.setService(mService);
try {
mTile = mService.getTile(new ComponentName(getPackageName(), getClass().getName()));
} catch (RemoteException e) {
throw new RuntimeException("Unable to reach IQSService", e);
}
if (mTile != null) {
mTile.setService(mService);
mHandler.sendEmptyMessage(H.MSG_START_SUCCESS);
}
return new IQSTileService.Stub() {
@Override
public void onTileRemoved() throws RemoteException {
@@ -358,6 +360,7 @@ public class TileService extends Service {
private static final int MSG_TILE_REMOVED = 4;
private static final int MSG_TILE_CLICKED = 5;
private static final int MSG_UNLOCK_COMPLETE = 6;
private static final int MSG_START_SUCCESS = 7;
public H(Looper looper) {
super(looper);
@@ -397,6 +400,12 @@ public class TileService extends Service {
mUnlockRunnable.run();
}
break;
case MSG_START_SUCCESS:
try {
mService.onStartSuccessful(mTile);
} catch (RemoteException e) {
}
break;
}
}
}

1
packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java vendored
View File

@@ -88,7 +88,6 @@ public class TileLifecycleManager extends BroadcastReceiver implements
mHandler = handler;
mIntent = intent;
mIntent.putExtra(TileService.EXTRA_SERVICE, service.asBinder());
mIntent.putExtra(TileService.EXTRA_TILE, tile);
mUser = user;
if (DEBUG) Log.d(TAG, "Creating " + mIntent + " " + mUser);
}

10
packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java vendored
View File

@@ -262,6 +262,16 @@ public class TileServices extends IQSService.Stub {
}
}
@Override
public Tile getTile(ComponentName componentName) {
verifyCaller(componentName.getPackageName());
CustomTile customTile = getTileForComponent(componentName);
if (customTile != null) {
return customTile.getQsTile();
}
return null;
}
@Override
public void startUnlockAndRun(Tile tile) {
ComponentName componentName = tile.getComponentName();