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

Commit 6c3438f1 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Move no cutout overlay packages to frameworks/base" into sc-dev am:... 

Merge "Move no cutout overlay packages to frameworks/base" into sc-dev am: 1bfc000a am: 676d67ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14278618

Change-Id: Ic731fbb83f1475a83936a08d9bcc6927836fc7d3
parents c55b43cf 676d67ce

packages/overlays/AvoidAppsInCutoutOverlay/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
//

//  Copyright 2021, 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.

//

package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



runtime_resource_overlay {

    name: "AvoidAppsInCutoutOverlay",

    theme: "DisplayCutoutAvoidAppsInCutout",

    product_specific: true,

}

packages/overlays/AvoidAppsInCutoutOverlay/AndroidManifest.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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.

  -->



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

        package="com.android.internal.display.cutout.emulation.avoidAppsInCutout"

        android:versionCode="1"

        android:versionName="1.0">

    <overlay android:targetPackage="android"

            android:category="com.android.internal.display_cutout_emulation"

            android:priority="0"/>



    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>

</manifest>

packages/overlays/AvoidAppsInCutoutOverlay/res/values/config.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Whether the display cutout region of the main built-in display should be forced to

         black in software (to avoid aliasing or emulate a cutout that is not physically existent).

     -->

    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>



    <!-- If true, hide the display cutout with display area -->

    <bool name="config_hideDisplayCutoutWithDisplayArea">true</bool>



</resources>

packages/overlays/AvoidAppsInCutoutOverlay/res/values/strings.xml

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

<!--

  ~ Copyright (C) 2021 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that masks the display cutout, i.e. avoid apps in cutout region.-->

    <string name="display_cutout_emulation_overlay">Hide (avoid apps in cutout region)</string>



</resources>

packages/overlays/NoCutoutOverlay/Android.bp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
//

//  Copyright 2021, 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.

//



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



runtime_resource_overlay {

    name: "NoCutoutOverlay",

    theme: "DisplayCutoutNoCutout",

    product_specific: true,

}