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

Commit 7e8a5182 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Enable FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS on phones and tablets" into oc-dev 

am: f4915233

Change-Id: I8f66fc1f298dacfc04fe0ad80fc2e54b160b6dcb
parents fe7ec4d0 f4915233

data/etc/android.software.activities_on_secondary_displays.xml

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

<!-- Copyright (C) 2017 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.

-->



<permissions>

    <feature name="android.software.activities_on_secondary_displays" />

</permissions>

data/etc/handheld_core_hardware.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ 
    <feature name="android.software.home_screen" />

    <feature name="android.software.home_screen" />

    <feature name="android.software.input_methods" />

    <feature name="android.software.input_methods" />

    <feature name="android.software.picture_in_picture" />

    <feature name="android.software.picture_in_picture" />

    <feature name="android.software.activities_on_secondary_displays" />

    <feature name="android.software.print" />

    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />

    <feature name="android.software.companion_device_setup" />

data/etc/tablet_core_hardware.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ 
    <feature name="android.software.home_screen" />

    <feature name="android.software.home_screen" />

    <feature name="android.software.input_methods" />

    <feature name="android.software.input_methods" />

    <feature name="android.software.picture_in_picture" />

    <feature name="android.software.picture_in_picture" />

    <feature name="android.software.activities_on_secondary_displays" />

    <feature name="android.software.print" />

    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />

    <feature name="android.software.companion_device_setup" />