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

Commit f033f79a authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 57630fe4 16cc72bd

Android.mk

+7 −5
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/3.xml 3 \

    -since ./frameworks/base/api/4.xml 4 \

    -since ./frameworks/base/api/5.xml 5 \

    -since ./frameworks/base/api/6.xml 6 \

		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -373,7 +374,7 @@ web_docs_sample_code_flags := \ 


## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

framework_docs_SDK_VERSION:=2.0

framework_docs_SDK_VERSION:=2.0.1

  # release version (ie "Release x")  (full releases only)

framework_docs_SDK_REL_ID:=1

  # name of current SDK directory (full releases only)
@@ -382,10 +383,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_ 
framework_docs_SDK_PREVIEW:=0



## Latest ADT version identifiers, for reference from published docs

framework_docs_ADT_VERSION:=0.9.4

framework_docs_ADT_DOWNLOAD:=ADT-0.9.4.zip

framework_docs_ADT_BYTES:=3367536

framework_docs_ADT_CHECKSUM:=4cdecd72b3e28022d8a55891f13e7d43

framework_docs_ADT_VERSION:=0.9.5

framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip

framework_docs_ADT_BYTES:=3372982

framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \
@@ -440,6 +441,7 @@ LOCAL_MODULE := offline-sdk 
LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

                $(web_docs_sample_code_flags) \

                -offlinemode \

		-title "Android SDK" \

		-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \

		-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \

core/java/android/provider/Checkin.java

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ public final class Checkin { 
            CARRIER_BUG_REPORT,

            CHECKIN_FAILURE,

            CHECKIN_SUCCESS,

            CPUFREQ_STATS,

            FOTA_BEGIN,

            FOTA_FAILURE,

            FOTA_INSTALL,

data/sounds/AudioPackage4.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \

	$(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \

	$(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \

	$(LOCAL_PATH)/notifications/Cricket.ogg:system/media/audio/notifications/Cricket.ogg \

	$(LOCAL_PATH)/notifications/Doink.ogg:system/media/audio/notifications/Doink.ogg \

	$(LOCAL_PATH)/notifications/Drip.ogg:system/media/audio/notifications/Drip.ogg \

	$(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \

	$(LOCAL_PATH)/notifications/SpaceSeed.ogg:system/media/audio/notifications/SpaceSeed.ogg \

	$(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \

	$(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \

	$(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg \

data/sounds/notifications/Cricket.ogg

0 → 100644
+10.7 KiB

File added.

No diff preview for this file type.

View file

data/sounds/notifications/Cricket.wav

0 → 100644
+154 KiB

File added.

No diff preview for this file type.

View file