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

Commit d2308771 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge changes Iaf1ee1e6,I861cb65d into nyc-dev 

* changes:
  Add TileService settings API
  Add QS long-press -> Settings
parents 5045253e 724214a8

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34579,6 +34579,7 @@ package android.service.quicksettings { 
    method public final void startActivityAndCollapse(android.content.Intent);

    method public final void unlockAndRun(java.lang.Runnable);

    field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";

    field public static final java.lang.String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";

    field public static final int TILE_MODE_ACTIVE = 2; // 0x2

    field public static final int TILE_MODE_PASSIVE = 1; // 0x1

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37134,6 +37134,7 @@ package android.service.quicksettings { 
    method public final void startActivityAndCollapse(android.content.Intent);

    method public final void unlockAndRun(java.lang.Runnable);

    field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";

    field public static final java.lang.String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";

    field public static final int TILE_MODE_ACTIVE = 2; // 0x2

    field public static final int TILE_MODE_PASSIVE = 1; // 0x1

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34594,6 +34594,7 @@ package android.service.quicksettings { 
    method public final void startActivityAndCollapse(android.content.Intent);

    method public final void unlockAndRun(java.lang.Runnable);

    field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";

    field public static final java.lang.String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";

    field public static final int TILE_MODE_ACTIVE = 2; // 0x2

    field public static final int TILE_MODE_PASSIVE = 1; // 0x1

  }

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -113,6 +113,21 @@ public final class Settings { 
    public static final String ACTION_LOCATION_SOURCE_SETTINGS =

            "android.settings.LOCATION_SOURCE_SETTINGS";



    /**

     * Activity Action: Show settings to allow configuration of users.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_USER_SETTINGS =

            "android.settings.USER_SETTINGS";



    /**

     * Activity Action: Show settings to allow configuration of wireless controls

     * such as Wi-Fi, Bluetooth and Mobile networks.

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

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package android.service.quicksettings;



import android.Manifest;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.app.Dialog;

import android.app.Service;
@@ -73,6 +75,14 @@ import android.view.WindowManager; 
 */

public class TileService extends Service {



    /**

     * An activity that provides a user interface for adjusting TileService preferences.

     * Optional but recommended for apps that implement a TileService.

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)

    public static final String ACTION_QS_TILE_PREFERENCES

            = "android.service.quicksettings.action.QS_TILE_PREFERENCES";



    /**

     * Action that identifies a Service as being a TileService.

     */