Merge "Add definitions, summaries and icons for VDM permissions" into main (f185fe38) · Commits · e / os / android_frameworks_base

core/java/android/companion/CompanionResources.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,11 @@ public final class CompanionResources {
		// Notification Listener Access & POST_NOTIFICATION permission
		public static final int PERMISSION_NOTIFICATIONS = 9;
		public static final int PERMISSION_CHANGE_MEDIA_OUTPUT = 10;
		public static final int PERMISSION_POST_NOTIFICATIONS = 11;
		public static final int PERMISSION_CREATE_VIRTUAL_DEVICE = 12;
		public static final int PERMISSION_ADD_MIRROR_DISPLAY = 13;
		public static final int PERMISSION_ADD_TRUSTED_DISPLAY = 14;
		public static final int PERMISSION_ADD_ALWAYS_UNLOCKED_DISPLAY = 15;

		// Constants used by AssociationRequestProcessor and CompanionAssociationActivity
		public static final String EXTRA_APPLICATION_CALLBACK = "application_callback";

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

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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="960"
		android:viewportHeight="960"
		android:tint="@android:color/system_accent1_200">
		<path
		android:pathData="M800,686L720,606L720,400Q720,400 720,400Q720,400 720,400L514,400L434,320L600,320L600,240Q600,190 565.5,155Q531,120 481,120Q431,120 397,154.5Q363,189 363,240L363,249L290,176Q312,115 365,77.5Q418,40 481,40Q564,40 622,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,686ZM820,932L758,870Q747,875 738,877.5Q729,880 720,880L240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,375 174.5,354Q189,333 212,324L28,140L84,84L876,876L820,932ZM686,800L539,651Q528,662 513.5,668Q499,674 482,674Q449,674 425.5,650.5Q402,627 402,594Q402,577 408,562.5Q414,548 425,537L286,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800L686,800ZM486,600L486,600L486,600Q486,600 486,600Q486,600 486,600L486,600Q486,600 486,600Q486,600 486,600ZM617,503L617,503L617,503Q617,503 617,503Q617,503 617,503Z"
		android:fillColor="#3C4043"
		android:fillType="evenOdd"/>
		</vector>

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

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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="960"
		android:viewportHeight="960"
		android:tint="@android:color/system_accent1_200">
		<path
		android:pathData="M480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480ZM800,800L600,800Q600,780 598.5,760Q597,740 594,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,286Q140,283 120,281.5Q100,280 80,280L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800ZM80,800L80,680Q130,680 165,715Q200,750 200,800L80,800ZM280,800Q280,717 221.5,658.5Q163,600 80,600L80,520Q197,520 278.5,601.5Q360,683 360,800L280,800ZM440,800Q440,725 411.5,659.5Q383,594 334.5,545.5Q286,497 220.5,468.5Q155,440 80,440L80,360Q171,360 251,394.5Q331,429 391,489Q451,549 485.5,629Q520,709 520,800L440,800Z"
		android:fillColor="#3C4043"
		android:fillType="evenOdd"/>
		</vector>

packages/CompanionDeviceManager/res/drawable-night/ic_permission_app_streaming.xml→packages/CompanionDeviceManager/res/drawable-night/ic_permission_add_trusted_display.xml

+0 −0

File moved.

View file

packages/CompanionDeviceManager/res/drawable-night/ic_permission_nearby_device_streaming.xml→packages/CompanionDeviceManager/res/drawable-night/ic_permission_create_virtual_device.xml

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2023 The Android Open Source Project
		~ 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.
		@@ -14,14 +13,14 @@
		~ 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:viewportWidth="960"
		android:viewportHeight="960"
		android:tint="@android:color/system_accent1_200">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M16,23V21H17Q17,21 17,21Q17,21 17,21V6H7V12H5V3Q5,2.175 5.588,1.587Q6.175,1 7,1H17Q17.825,1 18.413,1.587Q19,2.175 19,3V21Q19,21.825 18.413,22.413Q17.825,23 17,23ZM5,23V21Q5.825,21 6.412,21.587Q7,22.175 7,23ZM9,23Q9,21.35 7.825,20.175Q6.65,19 5,19V17Q7.5,17 9.25,18.75Q11,20.5 11,23ZM13,23Q13,19.65 10.675,17.325Q8.35,15 5,15V13Q7.075,13 8.9,13.787Q10.725,14.575 12.075,15.925Q13.425,17.275 14.213,19.1Q15,20.925 15,23ZM7,4H17V3Q17,3 17,3Q17,3 17,3H7Q7,3 7,3Q7,3 7,3ZM7,4V3Q7,3 7,3Q7,3 7,3Q7,3 7,3Q7,3 7,3V4Z"/>
		android:pathData="M200,440L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L680,240L280,240L280,440L200,440ZM200,920L200,840Q233,840 256.5,863.5Q280,887 280,920L200,920ZM360,920Q360,854 313,807Q266,760 200,760L200,680Q300,680 370,750Q440,820 440,920L360,920ZM520,920Q520,786 427,693Q334,600 200,600L200,520Q283,520 356,551.5Q429,583 483,637Q537,691 568.5,764Q600,837 600,920L520,920ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160Z"
		android:fillColor="#3C4043"
		android:fillType="evenOdd"/>
		</vector>