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

Commit 10ece726 authored by Ahmad Khalil's avatar Ahmad Khalil
Browse files

Move Haptics Customization Flag into Haptics 

Since the media namespace is not onboarded in gantry, we decided to move the haptics customization flag to the haptics namespace.

Bug: 293846645
Test: N/A
Change-Id: Icd091ae309f0e8097987147551972966cb128050
parent 8450f5c4

AconfigFlags.bp

+0 −14
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ java_defaults { 
        ":android.os.flags-aconfig-java{.generated_srcjars}",

        ":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",

        ":android.security.flags-aconfig-java{.generated_srcjars}",

        ":android.media.flags-aconfig-java{.generated_srcjars}",

        ":camera_platform_flags_core_java_lib{.generated_srcjars}",

        ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

        ":com.android.text.flags-aconfig-java{.generated_srcjars}",
@@ -172,16 +171,3 @@ java_aconfig_library { 
    aconfig_declarations: "android.os.vibrator.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}
 


// Media

aconfig_declarations {

    name: "android.media.flags-aconfig",

    package: "android.media",

    srcs: ["media/java/android/media/*.aconfig"],

}



java_aconfig_library {

    name: "android.media.flags-aconfig-java",

    aconfig_declarations: "android.media.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/java/android/os/vibrator/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag { 
    description: "Enables performHapticFeedback to directly use the vibrator service instead of going through the window session"

    bug: "295459081"

}



flag {

    namespace: "haptics"

    name: "haptics_customization_enabled"

    description: "Enables the haptics customization feature"

    bug: "241918098"

}
 
 No newline at end of file

media/java/android/media/flags.aconfig

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
package: "android.media"



flag {

    name: "haptics_customization_enabled"

    namespace: "media"

    description: "Enables the haptics customization feature"

    bug: "241918098"

}