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

Commit 4c86cba2 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Computer Control Session Consent Dialog" into main

parents e58b13fc ace7c694
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
package {
    default_applicable_licenses: ["frameworks_base_license"],
}

android_app {
    name: "VirtualDeviceManager",
    defaults: ["platform_app_defaults"],
    certificate: "platform",
    srcs: ["src/**/*.java"],
    static_libs: [
        "SettingsLibSettingsTheme",
    ],
    platform_apis: true,
    generate_product_characteristics_rro: true,
    optimize: {
        optimize: true,
        optimized_shrink_resources: true,
    },
}
+29 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.virtualdevicemanager">

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />

    <application
        android:allowBackup="false"
        android:allowClearUserData="false"
        android:label="@string/app_label"
        android:forceQueryable="true"
        android:supportsRtl="true">

        <activity
            android:name=".RequestComputerControlAccessActivity"
            android:theme="@style/Theme.RequestComputerControlAccessActivity.FilterTouches"
            android:excludeFromRecents="true"
            android:exported="true"
            android:launchMode="singleTop">
            <intent-filter android:priority="1">
                <action android:name="android.companion.virtual.computercontrol.action.REQUEST_ACCESS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

    </application>

</manifest>
+3 −0
Original line number Diff line number Diff line
# Bug component: 1171888

include /services/companion/java/com/android/server/companion/virtual/OWNERS
+47 −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.
  -->

<ScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/RequestComputerControlAccessDialogScrollView">
    <LinearLayout
        style="@style/RequestComputerControlAccessDialogContent">
        <ImageView
            android:id="@+id/agent_icon"
            style="@style/RequestComputerControlAccessDialogAgentIcon" />
        <TextView
            android:id="@+id/title"
            android:text="@string/request_computer_control_access_dialog_title"
            style="@style/RequestComputerControlAccessDialogTitle" />
        <TextView
            android:id="@+id/description"
            android:text="@string/request_computer_control_access_dialog_description"
            style="@style/RequestComputerControlAccessDialogDescription" />
        <Button
            android:id="@+id/allow_button"
            android:text="@string/request_computer_control_access_dialog_button_allow"
            style="@style/RequestComputerControlAccessDialogAllowButton" />
        <Button
            android:id="@+id/dont_allow_button"
            android:text="@string/request_computer_control_access_dialog_button_dont_allow"
            style="@style/RequestComputerControlAccessDialogDontAllowButton" />
        <Button
            android:id="@+id/always_allow_button"
            android:text="@string/request_computer_control_access_dialog_button_always_allow"
            style="@style/RequestComputerControlAccessDialogAlwaysAllowButton" />
    </LinearLayout>
</ScrollView>
+22 −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.
  -->

<resources>
    <style name="Theme.DeviceDefault.Dialog.NoActionBar.DayNight" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar" />
</resources>

Loading