diff --git a/api/current.xml b/api/current.xml index e9f13ba733cc3..614804708a48a 100644 --- a/api/current.xml +++ b/api/current.xml @@ -116568,6 +116568,8 @@ deprecated="not deprecated" visibility="public" > + + + + + + + + + + + + + + + + + + Type: TEXT

diff --git a/data/sounds/AudioPackage3.mk b/data/sounds/AudioPackage3.mk new file mode 100644 index 0000000000000..f2f62128adefb --- /dev/null +++ b/data/sounds/AudioPackage3.mk @@ -0,0 +1,92 @@ +# +# Audio Package 2 +# +# Include this file in a product makefile to include these audio files +# +# This is a larger package of sounds than the 1.0 release for devices +# that have larger internal flash. +# + +LOCAL_PATH:= frameworks/base/data/sounds + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/F1_MissedCall.ogg:system/media/audio/notifications/F1_MissedCall.ogg \ + $(LOCAL_PATH)/F1_New_MMS.ogg:system/media/audio/notifications/F1_New_MMS.ogg \ + $(LOCAL_PATH)/F1_New_SMS.ogg:system/media/audio/notifications/F1_New_SMS.ogg \ + $(LOCAL_PATH)/Alarm_Buzzer.ogg:system/media/audio/alarms/Alarm_Buzzer.ogg \ + $(LOCAL_PATH)/Alarm_Beep_01.ogg:system/media/audio/alarms/Alarm_Beep_01.ogg \ + $(LOCAL_PATH)/Alarm_Beep_02.ogg:system/media/audio/alarms/Alarm_Beep_02.ogg \ + $(LOCAL_PATH)/Alarm_Classic.ogg:system/media/audio/alarms/Alarm_Classic.ogg \ + $(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)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \ + $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ + $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ + $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ + $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ + $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ + $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ + $(LOCAL_PATH)/newwavelabs/CurveBall.ogg:system/media/audio/ringtones/CurveBall.ogg \ + $(LOCAL_PATH)/newwavelabs/EtherShake.ogg:system/media/audio/ringtones/EtherShake.ogg \ + $(LOCAL_PATH)/newwavelabs/Growl.ogg:system/media/audio/ringtones/Growl.ogg \ + $(LOCAL_PATH)/newwavelabs/LoopyLounge.ogg:system/media/audio/ringtones/LoopyLounge.ogg \ + $(LOCAL_PATH)/newwavelabs/LoveFlute.ogg:system/media/audio/ringtones/LoveFlute.ogg \ + $(LOCAL_PATH)/newwavelabs/MidEvilJaunt.ogg:system/media/audio/ringtones/MidEvilJaunt.ogg \ + $(LOCAL_PATH)/newwavelabs/MildlyAlarming.ogg:system/media/audio/ringtones/MildlyAlarming.ogg \ + $(LOCAL_PATH)/newwavelabs/NewPlayer.ogg:system/media/audio/ringtones/NewPlayer.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises1.ogg:system/media/audio/ringtones/Noises1.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises2.ogg:system/media/audio/ringtones/Noises2.ogg \ + $(LOCAL_PATH)/newwavelabs/Noises3.ogg:system/media/audio/ringtones/Noises3.ogg \ + $(LOCAL_PATH)/newwavelabs/OrganDub.ogg:system/media/audio/ringtones/OrganDub.ogg \ + $(LOCAL_PATH)/newwavelabs/Terminated.ogg:system/media/audio/ringtones/Terminated.ogg \ + $(LOCAL_PATH)/newwavelabs/TwirlAway.ogg:system/media/audio/ringtones/TwirlAway.ogg \ + $(LOCAL_PATH)/newwavelabs/World.ogg:system/media/audio/ringtones/World.ogg \ + $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg \ + $(LOCAL_PATH)/newwavelabs/DearDeer.ogg:system/media/audio/notifications/DearDeer.ogg \ + $(LOCAL_PATH)/newwavelabs/DontPanic.ogg:system/media/audio/notifications/DontPanic.ogg \ + $(LOCAL_PATH)/newwavelabs/Highwire.ogg:system/media/audio/notifications/Highwire.ogg \ + $(LOCAL_PATH)/newwavelabs/KzurbSonar.ogg:system/media/audio/notifications/KzurbSonar.ogg \ + $(LOCAL_PATH)/newwavelabs/OnTheHunt.ogg:system/media/audio/notifications/OnTheHunt.ogg \ + $(LOCAL_PATH)/newwavelabs/Voila.ogg:system/media/audio/notifications/Voila.ogg \ + $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.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)/effects/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \ + $(LOCAL_PATH)/effects/KeypressStandard.ogg:system/media/audio/ui/KeypressStandard.ogg \ + $(LOCAL_PATH)/effects/KeypressSpacebar.ogg:system/media/audio/ui/KeypressSpacebar.ogg \ + $(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \ + $(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \ + $(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ + $(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ + $(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \ + $(LOCAL_PATH)/newwavelabs/Bollywood.ogg:system/media/audio/ringtones/Bollywood.ogg \ + $(LOCAL_PATH)/newwavelabs/Cairo.ogg:system/media/audio/ringtones/Cairo.ogg \ + $(LOCAL_PATH)/newwavelabs/Calypso_Steel.ogg:system/media/audio/ringtones/Calypso_Steel.ogg \ + $(LOCAL_PATH)/newwavelabs/Champagne_Edition.ogg:system/media/audio/ringtones/Champagne_Edition.ogg \ + $(LOCAL_PATH)/newwavelabs/Club_Cubano.ogg:system/media/audio/ringtones/Club_Cubano.ogg \ + $(LOCAL_PATH)/newwavelabs/Eastern_Sky.ogg:system/media/audio/ringtones/Eastern_Sky.ogg \ + $(LOCAL_PATH)/newwavelabs/Funk_Yall.ogg:system/media/audio/ringtones/Funk_Yall.ogg \ + $(LOCAL_PATH)/newwavelabs/Savannah.ogg:system/media/audio/ringtones/Savannah.ogg \ + $(LOCAL_PATH)/newwavelabs/Gimme_Mo_Town.ogg:system/media/audio/ringtones/Gimme_Mo_Town.ogg \ + $(LOCAL_PATH)/newwavelabs/Glacial_Groove.ogg:system/media/audio/ringtones/Glacial_Groove.ogg \ + $(LOCAL_PATH)/newwavelabs/Seville.ogg:system/media/audio/ringtones/Seville.ogg \ + $(LOCAL_PATH)/newwavelabs/No_Limits.ogg:system/media/audio/ringtones/No_Limits.ogg \ + $(LOCAL_PATH)/newwavelabs/Paradise_Island.ogg:system/media/audio/ringtones/Paradise_Island.ogg \ + $(LOCAL_PATH)/newwavelabs/Road_Trip.ogg:system/media/audio/ringtones/Road_Trip.ogg \ + $(LOCAL_PATH)/newwavelabs/Shes_All_That.ogg:system/media/audio/ringtones/Shes_All_That.ogg \ + $(LOCAL_PATH)/newwavelabs/Steppin_Out.ogg:system/media/audio/ringtones/Steppin_Out.ogg \ + $(LOCAL_PATH)/newwavelabs/Third_Eye.ogg:system/media/audio/ringtones/Third_Eye.ogg \ + $(LOCAL_PATH)/newwavelabs/Thunderfoot.ogg:system/media/audio/ringtones/Thunderfoot.ogg \ + $(LOCAL_PATH)/newwavelabs/HalfwayHome.ogg:system/media/audio/ringtones/HalfwayHome.ogg \ + $(LOCAL_PATH)/newwavelabs/CrayonRock.ogg:system/media/audio/ringtones/CrayonRock.ogg \ + $(LOCAL_PATH)/newwavelabs/DancinFool.ogg:system/media/audio/ringtones/DancinFool.ogg \ + $(LOCAL_PATH)/newwavelabs/BussaMove.ogg:system/media/audio/ringtones/BussaMove.ogg \ + $(LOCAL_PATH)/newwavelabs/DonMessWivIt.ogg:system/media/audio/ringtones/DonMessWivIt.ogg \ + $(LOCAL_PATH)/newwavelabs/SilkyWay.ogg:system/media/audio/ringtones/SilkyWay.ogg \ + $(LOCAL_PATH)/newwavelabs/Playa.ogg:system/media/audio/ringtones/Playa.ogg \ + $(LOCAL_PATH)/notifications/moonbeam.ogg:system/media/audio/notifications/moonbeam.ogg \ + $(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \ + $(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \ + $(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg + diff --git a/data/sounds/newwavelabs/BussaMove.ogg b/data/sounds/newwavelabs/BussaMove.ogg new file mode 100644 index 0000000000000..7c9f7b5e9441a Binary files /dev/null and b/data/sounds/newwavelabs/BussaMove.ogg differ diff --git a/data/sounds/newwavelabs/BussaMove.wav b/data/sounds/newwavelabs/BussaMove.wav new file mode 100644 index 0000000000000..a82d62b7601e0 Binary files /dev/null and b/data/sounds/newwavelabs/BussaMove.wav differ diff --git a/data/sounds/newwavelabs/CrayonRock.ogg b/data/sounds/newwavelabs/CrayonRock.ogg new file mode 100644 index 0000000000000..6827aa5ba7e6b Binary files /dev/null and b/data/sounds/newwavelabs/CrayonRock.ogg differ diff --git a/data/sounds/newwavelabs/CrayonRock.wav b/data/sounds/newwavelabs/CrayonRock.wav new file mode 100644 index 0000000000000..ce42f38f19323 Binary files /dev/null and b/data/sounds/newwavelabs/CrayonRock.wav differ diff --git a/data/sounds/newwavelabs/DancinFool.ogg b/data/sounds/newwavelabs/DancinFool.ogg new file mode 100644 index 0000000000000..39e3b8ab9a611 Binary files /dev/null and b/data/sounds/newwavelabs/DancinFool.ogg differ diff --git a/data/sounds/newwavelabs/DancinFool.wav b/data/sounds/newwavelabs/DancinFool.wav new file mode 100644 index 0000000000000..f5ef13f325b58 Binary files /dev/null and b/data/sounds/newwavelabs/DancinFool.wav differ diff --git a/data/sounds/newwavelabs/DonMessWivIt.ogg b/data/sounds/newwavelabs/DonMessWivIt.ogg new file mode 100644 index 0000000000000..5b14ba5dc05c3 Binary files /dev/null and b/data/sounds/newwavelabs/DonMessWivIt.ogg differ diff --git a/data/sounds/newwavelabs/DonMessWivIt.wav b/data/sounds/newwavelabs/DonMessWivIt.wav new file mode 100644 index 0000000000000..7d9e8af499ec8 Binary files /dev/null and b/data/sounds/newwavelabs/DonMessWivIt.wav differ diff --git a/data/sounds/newwavelabs/HalfwayHome.ogg b/data/sounds/newwavelabs/HalfwayHome.ogg new file mode 100644 index 0000000000000..4ece7cab10d58 Binary files /dev/null and b/data/sounds/newwavelabs/HalfwayHome.ogg differ diff --git a/data/sounds/newwavelabs/HalfwayHome.wav b/data/sounds/newwavelabs/HalfwayHome.wav new file mode 100644 index 0000000000000..00dbaccd82b4b Binary files /dev/null and b/data/sounds/newwavelabs/HalfwayHome.wav differ diff --git a/data/sounds/newwavelabs/Playa.ogg b/data/sounds/newwavelabs/Playa.ogg new file mode 100644 index 0000000000000..747b6995fb28d Binary files /dev/null and b/data/sounds/newwavelabs/Playa.ogg differ diff --git a/data/sounds/newwavelabs/Playa.wav b/data/sounds/newwavelabs/Playa.wav new file mode 100644 index 0000000000000..65866132ee82e Binary files /dev/null and b/data/sounds/newwavelabs/Playa.wav differ diff --git a/data/sounds/newwavelabs/SilkyWay.ogg b/data/sounds/newwavelabs/SilkyWay.ogg new file mode 100644 index 0000000000000..e5a38ec05c0f0 Binary files /dev/null and b/data/sounds/newwavelabs/SilkyWay.ogg differ diff --git a/data/sounds/newwavelabs/SilkyWay.wav b/data/sounds/newwavelabs/SilkyWay.wav new file mode 100644 index 0000000000000..6becaacce17b4 Binary files /dev/null and b/data/sounds/newwavelabs/SilkyWay.wav differ diff --git a/services/java/com/android/server/InputDevice.java b/services/java/com/android/server/InputDevice.java index 2dc45b53df599..eaad3b7990cc5 100644 --- a/services/java/com/android/server/InputDevice.java +++ b/services/java/com/android/server/InputDevice.java @@ -268,6 +268,7 @@ public class InputDevice { while (start != end) { int soff = poff + (start*MotionEvent.NUM_SAMPLE_DATA); int pressure = mHistoryData[soff + MotionEvent.SAMPLE_PRESSURE]; + if (pressure <= 0) pressure = 1; x += mHistoryData[soff + MotionEvent.SAMPLE_X] * pressure; y += mHistoryData[soff + MotionEvent.SAMPLE_Y] * pressure; totalPressure += pressure; @@ -276,6 +277,7 @@ public class InputDevice { } int eoff = poff + (end*MotionEvent.NUM_SAMPLE_DATA); int pressure = mHistoryData[eoff + MotionEvent.SAMPLE_PRESSURE]; + if (pressure <= 0) pressure = 1; x += mHistoryData[eoff + MotionEvent.SAMPLE_X] * pressure; y += mHistoryData[eoff + MotionEvent.SAMPLE_Y] * pressure; totalPressure += pressure; diff --git a/services/java/com/android/server/KeyInputQueue.java b/services/java/com/android/server/KeyInputQueue.java index 09591f44e5e34..5d65c714e77c4 100644 --- a/services/java/com/android/server/KeyInputQueue.java +++ b/services/java/com/android/server/KeyInputQueue.java @@ -721,11 +721,14 @@ public abstract class KeyInputQueue { // virtual key area... but still // propagate this to the previous // data for comparisons. + int num = ms.mNextNumPointers; + if (num > InputDevice.MAX_POINTERS) { + num = InputDevice.MAX_POINTERS; + } System.arraycopy(ms.mNextData, 0, ms.mLastData, 0, - ms.mNextNumPointers - * MotionEvent.NUM_SAMPLE_DATA); - ms.mLastNumPointers = ms.mNextNumPointers; + num * MotionEvent.NUM_SAMPLE_DATA); + ms.mLastNumPointers = num; } ms.finish();