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

Commit 152b69ad authored by Justin Koh's avatar Justin Koh Committed by Android (Google) Code Review
Browse files

Merge "Add FX_KEYPRESS_INVALID constant to AudioManager."

parents 20bf1225 cacfe69b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11609,6 +11609,7 @@ package android.media { 
    field public static final int FX_FOCUS_NAVIGATION_RIGHT = 4; // 0x4

    field public static final int FX_FOCUS_NAVIGATION_UP = 1; // 0x1

    field public static final int FX_KEYPRESS_DELETE = 7; // 0x7

    field public static final int FX_KEYPRESS_INVALID = 9; // 0x9

    field public static final int FX_KEYPRESS_RETURN = 8; // 0x8

    field public static final int FX_KEYPRESS_SPACEBAR = 6; // 0x6

    field public static final int FX_KEYPRESS_STANDARD = 5; // 0x5

core/res/res/xml/audio_assets.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ 
        <asset id="FX_KEYPRESS_SPACEBAR" file="KeypressSpacebar.ogg"/>

        <asset id="FX_KEYPRESS_DELETE" file="KeypressDelete.ogg"/>

        <asset id="FX_KEYPRESS_RETURN" file="KeypressReturn.ogg"/>

        <asset id="FX_KEYPRESS_INVALID" file="KeypressInvalid.ogg"/>

    </group>

</audio_assets>

data/sounds/AllAudio.mk

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ PRODUCT_COPY_FILES += \ 
    $(LOCAL_PATH)/effects/ogg/KeypressReturn_120_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \

    $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120_48k.ogg:system/media/audio/ui/KeypressSpacebar.ogg \

    $(LOCAL_PATH)/effects/ogg/KeypressStandard_120_48k.ogg:system/media/audio/ui/KeypressStandard.ogg \

    $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \

    $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \

    $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \

    $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \

data/sounds/effects/KeypressInvalid.ogg

0 → 100644
+9.62 KiB

File added.

No diff preview for this file type.

View file

data/sounds/effects/KeypressInvalid.wav

0 → 100644
+15.8 KiB

File added.

No diff preview for this file type.

View file