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

Commit 06ae934c authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q4 (ab/12406339) into aosp-main-future 

Bug: 370570306
Merged-In: Ia971f25c50b8fe188230e7016d3b30e4e5984266
Change-Id: I336e3a3704d65ffa61ce892be8ff1df999481b66
parents aac9636e 90603d22

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPL 
ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



[Tool Paths]

ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar
 
ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh

aconfig/systemui.aconfig

+28 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ flag { 
    bug: "273205603"

}



flag {

    name: "return_animation_framework_long_lived"

    namespace: "systemui"

    description: "Turn on long-lived Return registrations in the Animation library"

    bug: "273205603"

}



flag {

    name: "shade_allow_back_gesture"

    namespace: "systemui"
@@ -41,3 +48,24 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "new_touchpad_gestures_tutorial"

  namespace: "systemui"

  description: "Enables new interactive tutorial for learning touchpad gestures"

  bug: "309928033"

}



flag {

    name: "three_button_corner_swipe"

    namespace: "systemui"

    description: "Allow the Assistant corner swipe gesture while in 3 button mode"

    bug: "361651619"

}



flag {

    name: "new_customization_picker_ui"

    namespace: "systemui"

    description: "Enables the BC25 design of the customization picker UI."

    bug: "339081035"

}

contextualeducationlib/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// Copyright 2024 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 {

    default_team: "trendy_team_large_screen_experiences_sysui",

    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_library {

    name: "contextualeducationlib",

    manifest: "AndroidManifest.xml",

    sdk_version: "system_current",

    min_sdk_version: "26",

    srcs: [

        "src/**/*.kt",

    ],

    kotlincflags: ["-Xjvm-default=all"],

}

contextualeducationlib/AndroidManifest.xml

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

<!--

     Copyright 2024 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.systemui.contextualeducation">

</manifest>

contextualeducationlib/build.gradle

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

 * Copyright 2024 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.

 */



plugins {

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

}

android {

    namespace = "com.android.systemui.contextualeducation"



    sourceSets {

        main {

            java.srcDirs = ['src']

            manifest.srcFile 'AndroidManifest.xml'

        }

    }

}
 
 No newline at end of file