Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 792e43cb authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am:... 

Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da5 am: 74a8b654 am: a8e10e5f
am: 6e8c039e

Change-Id: If9ed9697cc042375abd3d77b1eb4020d2798f96c
parents 11bbd9e2 6e8c039e

core/java/android/service/quicksettings/TileService.java

+5 −0
Original line number Diff line number Diff line
@@ -130,6 +130,11 @@ public class TileService extends Service { 
     */

    public static final String EXTRA_COMPONENT = "android.service.quicksettings.extra.COMPONENT";



    /**

     * @hide

     */

    public static final String EXTRA_STATE = "state";



    private final H mHandler = new H(Looper.getMainLooper());



    private boolean mListening = false;

packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen 
        i.setPackage(mComponent.getPackageName());

        i = resolveIntent(i);

        if (i != null) {

            i.putExtra(TileService.EXTRA_COMPONENT, mComponent);

            i.putExtra(TileService.EXTRA_STATE, mTile.getState());

            return i;

        }

        return new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).setData(