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

Commit c23a6fdc authored by Raphael Kim's avatar Raphael Kim Committed by Android (Google) Code Review
Browse files

Merge "[26Q2][CDM] Add fitness tracker profile to CDM." into main

parents 8d900756 402db3a0

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10302,6 +10302,7 @@ package android.companion { 
    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING) public static final String DEVICE_PROFILE_APP_STREAMING = "android.app.role.COMPANION_DEVICE_APP_STREAMING";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION) public static final String DEVICE_PROFILE_AUTOMOTIVE_PROJECTION = "android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER) public static final String DEVICE_PROFILE_COMPUTER = "android.app.role.COMPANION_DEVICE_COMPUTER";

    field @FlaggedApi("android.companion.band_device_profile") @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH) public static final String DEVICE_PROFILE_FITNESS_TRACKER = "android.app.role.COMPANION_DEVICE_FITNESS_TRACKER";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_GLASSES) public static final String DEVICE_PROFILE_GLASSES = "android.app.role.COMPANION_DEVICE_GLASSES";

    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING) public static final String DEVICE_PROFILE_NEARBY_DEVICE_STREAMING = "android.app.role.COMPANION_DEVICE_NEARBY_DEVICE_STREAMING";

    field @FlaggedApi("android.companion.virtualdevice.flags.enable_limited_vdm_role") @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_VIRTUAL_DEVICE) public static final String DEVICE_PROFILE_VIRTUAL_DEVICE = "android.app.role.COMPANION_DEVICE_VIRTUAL_DEVICE";

core/java/android/companion/AssociationRequest.java

+20 −0
Original line number Diff line number Diff line
@@ -78,6 +78,26 @@ public final class AssociationRequest implements Parcelable { 
     */

    public static final String DEVICE_PROFILE_WATCH = "android.app.role.COMPANION_DEVICE_WATCH";



    /**

     * Device profile: fitness tracker.

     *

     * If specified, the current request may have a modified UI to highlight that the device being

     * set up is a specific kind of device, and some extra permissions may be granted to the app

     * as a result.

     *

     * Using it requires declaring uses-permission

     * {@link android.Manifest.permission#REQUEST_COMPANION_PROFILE_WATCH} in the manifest.

     *

     * <a href="{@docRoot}about/versions/12/features#cdm-profiles">Learn more</a>

     * about device profiles.

     *

     * @see AssociationRequest.Builder#setDeviceProfile

     */

    @FlaggedApi(Flags.FLAG_BAND_DEVICE_PROFILE)

    @RequiresPermission(Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH)

    public static final String DEVICE_PROFILE_FITNESS_TRACKER =

            "android.app.role.COMPANION_DEVICE_FITNESS_TRACKER";



    /**

     * Device profile: glasses.

     *

core/java/android/companion/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,14 @@ flag { 
    bug: "414859687"

}



flag {

    name: "band_device_profile"

    is_exported: true

    namespace: "companion"

    description: "Introduce a new device profile for band categories"

    bug: "420665366"

}



flag {

    name: "enable_remote_app_access"

    is_exported: false

packages/CompanionDeviceManager/res/drawable-night/ic_fitness_tracker.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2025 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="@android:color/system_accent1_200">

    <path android:fillColor="@android:color/white"

          android:pathData="M9 22 7.8 18.025Q7.425 17.625 7.2125 17.1 7 16.575 7 16L7 8Q7 7.4 7.2125 6.875 7.425 6.35 7.8 5.95L9 2 15 2 16.15 5.925Q16.55 6.35 16.775 6.875 17 7.4 17 8L17 16Q17 16.6 16.7875 17.125 16.575 17.65 16.175 18.075L15 22 9 22ZM10.475 20 13.5 20 13.8 19 10.175 19 10.475 20ZM10 17 14 17Q14.425 17 14.7125 16.7125 15 16.425 15 16L15 8Q15 7.575 14.7125 7.2875 14.425 7 14 7L10 7Q9.575 7 9.2875 7.2875 9 7.575 9 8L9 16Q9 16.425 9.2875 16.7125 9.575 17 10 17ZM10.175 5 13.8 5 13.5 4 10.475 4 10.175 5ZM11.975 19 11.975 19 11.975 19 11.975 19ZM11.975 5 11.975 5 11.975 5 11.975 5Z"/>

</vector>

packages/CompanionDeviceManager/res/drawable/ic_fitness_tracker.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2025 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="@android:color/system_accent1_600">

    <path android:fillColor="@android:color/white"

          android:pathData="M9 22 7.8 18.025Q7.425 17.625 7.2125 17.1 7 16.575 7 16L7 8Q7 7.4 7.2125 6.875 7.425 6.35 7.8 5.95L9 2 15 2 16.15 5.925Q16.55 6.35 16.775 6.875 17 7.4 17 8L17 16Q17 16.6 16.7875 17.125 16.575 17.65 16.175 18.075L15 22 9 22ZM10.475 20 13.5 20 13.8 19 10.175 19 10.475 20ZM10 17 14 17Q14.425 17 14.7125 16.7125 15 16.425 15 16L15 8Q15 7.575 14.7125 7.2875 14.425 7 14 7L10 7Q9.575 7 9.2875 7.2875 9 7.575 9 8L9 16Q9 16.425 9.2875 16.7125 9.575 17 10 17ZM10.175 5 13.8 5 13.5 4 10.475 4 10.175 5ZM11.975 19 11.975 19 11.975 19 11.975 19ZM11.975 5 11.975 5 11.975 5 11.975 5Z"/>

</vector>