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

Commit af3e3026 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

VDM Settings 

Demo: go/vdm-settings-demo

Bug: 371713473
Bug: 338974320
Test: atest
Flag: android.companion.virtualdevice.flags.vdm_settings
Change-Id: I4a818b1b31ad59ee3de22105b969aec4c7f4d529
parent 597b3c64

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ android_library { 
        "BiometricsSharedLib",

        "SystemUIUnfoldLib",

        "WifiTrackerLib",

        "android.companion.flags-aconfig-java",

        "android.companion.virtualdevice.flags-aconfig-java",

        "android.hardware.biometrics.flags-aconfig-java",

        "android.hardware.dumpstate-V1-java",

        "android.hardware.dumpstate-V1.0-java",

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
    <uses-permission android:name="android.permission.GET_BACKGROUND_INSTALLED_PACKAGES" />

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

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

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



    <application

            android:name=".SettingsApplication"

res-product/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -457,6 +457,18 @@ 
    <string name="bluetooth_unpair_dialog_body" product="tablet">Your tablet will no longer be paired with <xliff:g id="device_name">%1$s</xliff:g></string>

    <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->

    <string name="bluetooth_unpair_dialog_body" product="device">Your device will no longer be paired with <xliff:g id="device_name">%1$s</xliff:g></string>

    <!--  Virtual device details. The body of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=none] -->

    <string name="virtual_device_forget_dialog_body" product="default"><xliff:g id="device_name">%1$s</xliff:g> will no longer be connected to this phone. If you continue, some apps and app streaming may stop working.</string>

    <!--  Virtual device details. The body of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=none] -->

    <string name="virtual_device_forget_dialog_body" product="tablet"><xliff:g id="device_name">%1$s</xliff:g> will no longer be connected to this tablet. If you continue, some apps and app streaming may stop working.</string>

    <!--  Virtual device details. The body of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=none] -->

    <string name="virtual_device_forget_dialog_body" product="device"><xliff:g id="device_name">%1$s</xliff:g> will no longer be connected to this device. If you continue, some apps and app streaming may stop working.</string>

    <!--  Virtual device details. Footer [CHAR LIMIT=none] -->

    <string name="virtual_device_details_footer_title" product="default">If you forget <xliff:g id="device_name">%1$s</xliff:g>, it will no longer be associated to this phone. Some permissions will be removed and some apps and app streaming may stop working.</string>

    <!--  Virtual device details. Footer [CHAR LIMIT=none] -->

    <string name="virtual_device_details_footer_title" product="tablet">If you forget <xliff:g id="device_name">%1$s</xliff:g>, it will no longer be associated to this tablet. Some permissions will be removed and some apps and app streaming may stop working.</string>

    <!--  Virtual device details. Footer [CHAR LIMIT=none] -->

    <string name="virtual_device_details_footer_title" product="device">If you forget <xliff:g id="device_name">%1$s</xliff:g>, it will no longer be associated to this device. Some permissions will be removed and some apps and app streaming may stop working.</string>

    <!-- Description of Secure NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->

    <string name="nfc_secure_toggle_summary" product="default">Allow NFC use only when screen is unlocked</string>

    <!-- Summary for the panel of add Wi-Fi network from APP [CHAR LIMIT=NONE] -->

res/drawable/ic_devices_other.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M3,6.003H21V4.003H3C1.9,4.003 1,4.903 1,6.003V18.003C1,19.103 1.9,20.003 3,20.003H7V18.003H3V6.003ZM13.002,12.001H9.002V13.781C8.392,14.331 8.002,15.111 8.002,16.001C8.002,16.891 8.392,17.671 9.002,18.221V20.001H13.002V18.221C13.612,17.671 14.002,16.881 14.002,16.001C14.002,15.121 13.612,14.331 13.002,13.781V12.001ZM9.501,16.003C9.501,16.833 10.171,17.503 11.001,17.503C11.831,17.503 12.501,16.833 12.501,16.003C12.501,15.173 11.831,14.503 11.001,14.503C10.171,14.503 9.501,15.173 9.501,16.003ZM22,8.004H16C15.5,8.004 15,8.504 15,9.004V19.004C15,19.504 15.5,20.004 16,20.004H22C22.5,20.004 23,19.504 23,19.004V9.004C23,8.504 22.5,8.004 22,8.004ZM17.002,18H21.002V10H17.002V18Z"

        android:fillType="evenOdd"

res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -13271,6 +13271,21 @@ 
    <!-- Label for button to not allow grant the permission for remote devices. [CHAR_LIMIT=50] -->

    <string name="request_manage_bluetooth_permission_dont_allow">Don\u2019t allow</string>









    <!-- Summary for a connected Virtual Device [CHAR LIMIT=50] -->









    <string name="virtual_device_connected">Connected</string>









    <!-- Summary for a disconnected Virtual Device [CHAR LIMIT=50] -->









    <string name="virtual_device_disconnected">Disconnected</string>









    <!-- The name of virtual device if there's no display name available. [CHAR LIMIT=60] -->









    <string name="virtual_device_unknown">Unknown device</string>









    <!-- Title for virtual device details page [CHAR LIMIT=50] -->









    <string name="virtual_device_details_title">Device details</string>









    <!-- The title of a confirmation dialog for forgetting a virtual device. [CHAR LIMIT=30] -->









    <string name="virtual_device_forget_dialog_title">Forget <xliff:g id="device_name">%1$s</xliff:g>?</string>









    <!-- In the confirmation dialog for forgetting a virtual device, this is the label on the button that will complete the forget action. -->









    <string name="virtual_device_forget_dialog_confirm_button">Forget</string>









    <!-- The title of the companion app section in the virtual device details page [CHAR LIMIT=50] -->









    <string name="virtual_device_companion_app_category">Connection managed by</string>

















    <!-- Title for UWB preference [CHAR_LIMIT=60] -->









    <string name="uwb_settings_title">Ultra-Wideband (UWB)</string>