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

Commit 4e3ead32 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "DisplayCutout: Add more display cutout flavors"

parents d3f9248b 88553e9d

packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk

0 → 100644
+13 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_RRO_THEME := DisplayCutoutEmulationNarrow

LOCAL_CERTIFICATE := platform



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := DisplayCutoutEmulationNarrowOverlay



include $(BUILD_RRO_PACKAGE)

packages/overlays/DisplayCutoutEmulationOverlay/AndroidManifest.xml→packages/overlays/DisplayCutoutEmulationNarrowOverlay/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

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

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

        android:versionCode="1"

        android:versionName="1.0">

    <overlay android:targetPackage="android" android:priority="1"/>

packages/overlays/DisplayCutoutEmulationOverlay/res/values/config.xml→packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values/config.xml

+1 −1

File changed and moved.

Contains only whitespace changes.

packages/overlays/DisplayCutoutEmulationOverlay/res/values/strings.xml→packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <string name="display_cutout_emulation_overlay">Display Cutout Emulation</string>

    <string name="display_cutout_emulation_overlay">Narrow display cutout</string>



</resources>

packages/overlays/DisplayCutoutEmulationOverlay/Android.mk→packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk

+2 −2
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_RRO_THEME := DisplayCutoutEmulation

LOCAL_RRO_THEME := DisplayCutoutEmulationTall

LOCAL_CERTIFICATE := platform



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := DisplayCutoutEmulationOverlay

LOCAL_PACKAGE_NAME := DisplayCutoutEmulationTallOverlay



include $(BUILD_RRO_PACKAGE)