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

Commit 2b614f30 authored by Vania Januar's avatar Vania Januar Committed by Automerger Merge Worker
Browse files

Merge "Add a runtime overlay for config_enableDefaultNotes" into udc-dev am:... 

Merge "Add a runtime overlay for config_enableDefaultNotes" into udc-dev am: 2c574049 am: 69409af4

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



Change-Id: I58c62d5451934db6dca590c8490d3582dd6de2ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1638b920 69409af4

data/etc/preinstalled-packages-platform-overlays.xml

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
    <install-in-user-type package="com.android.internal.systemui.navbar.transparent">

        <install-in user-type="FULL" />

    </install-in-user-type>

    <install-in-user-type package="com.android.role.notes.enabled">

        <install-in user-type="FULL" />

    </install-in-user-type>

    <install-in-user-type package="com.android.theme.color.amethyst">

        <install-in user-type="FULL" />

        <install-in user-type="PROFILE" />

packages/overlays/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ LOCAL_REQUIRED_MODULES := \ 
	NavigationBarModeGesturalOverlayWideBack \

	NavigationBarModeGesturalOverlayExtraWideBack \

	TransparentNavigationBarOverlay \

	NotesRoleEnabledOverlay \

	preinstalled-packages-platform-overlays.xml



include $(BUILD_PHONY_PACKAGE)

packages/overlays/NotesRoleEnabledOverlay/Android.bp

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

//  Copyright 2023, 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: "NotesRoleEnabledOverlay",

    theme: "NotesRoleEnabled",

    product_specific: true,

}

packages/overlays/NotesRoleEnabledOverlay/AndroidManifest.xml

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

/**

 * Copyright (c) 2023, 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.role.notes.enabled"

        android:versionCode="1"

        android:versionName="1.0">

    <overlay android:targetPackage="android"

        android:priority="1"/>



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

</manifest>
 
 No newline at end of file

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

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

<!--

/**

 * Copyright (c) 2023, 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>

    <!-- Whether the default notes role should be enabled. In builds without 

    device-specific overlays, this can be controlled in developer options. -->

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



    <!-- Whether the default notes role for work profile should be enabled. 

    In builds without device-specific overlays, this can be controlled in 

    developer options. -->

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

</resources>