drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,112 Commits 1 Branch 0 Tags
Commit Graph

657 Commits

Author SHA1 Message Date
Marco Nelissen
2c3dc14acb am a97402e1: am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb. 
Merge commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177' into eclair-mr2-plus-aosp

* commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177':
  Music visualizer support hack.
 2009-10-06 10:03:12 -07:00
Marco Nelissen
c39d2e3c01 Music visualizer support hack. 
This currently assumes 44k stereo (won't crash on other formats, but won't give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
 2009-10-06 08:51:16 -07:00
Josh Guilfoyle
336a0ee90f Fixed issue #4098: Ringtone#getTitle does not close its cursor. 
http://code.google.com/p/android/issues/detail?id=4098
 2009-10-02 17:39:36 -07:00
Dianne Hackborn
943c8e7de6 am 29e4a3c5: Update from API review. 
Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp

* commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
  Update from API review.
 2009-09-30 23:27:41 -07:00
Dianne Hackborn
29e4a3c566 Update from API review. 
Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
 2009-09-30 23:21:02 -07:00
Ray Chen
a6715ca6f9 am f09edd60: Merge change Id60fa26a into eclair 
Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
  Fix issue 2152541	thumbnail images stretched.
 2009-09-30 22:18:41 -07:00
Android (Google) Code Review
f09edd6037 Merge change Id60fa26a into eclair 
* changes:
  Fix issue 2152541	thumbnail images stretched.
 2009-10-01 01:12:35 -04:00
Ray Chen
ef093cd6c4 Fix issue 2152541 thumbnail images stretched. 2009-09-30 22:05:33 -07:00
Eric Laurent
46c5fdf60b am 3f56d21b: Merge change I89e74ba1 into eclair 
Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp

* commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
 2009-09-30 21:16:47 -07:00
Eric Laurent
89e74ba141 Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash. 
The problem comes from the fact that the AudioSystem callback indicating that the media server is active again is ignored if it is received before the delayed message indicating media server death. This happens if another application or service running in the system server process makes a request to the AudioSystem in the interval between the death of the media server and the reception of the corresponding delayed message.

The fix consists in resetting mMediaServerOk flags immediately when the death callback is received and not when the delayed message is received.
 2009-09-30 18:26:36 -07:00
Chih-Chung Chang
412933234a am 8bbba0e3: Merge change If5722b3f into eclair 
Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp

* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
  Dont NPE if the thumbnail file cannot be opened.
 2009-09-29 17:00:24 -07:00
Android (Google) Code Review
8bbba0e35b Merge change If5722b3f into eclair 
* changes:
  Dont NPE if the thumbnail file cannot be opened.
 2009-09-29 19:52:23 -04:00
Chih-Chung Chang
f5722b3f22 Dont NPE if the thumbnail file cannot be opened. 2009-09-29 16:31:16 -07:00
Eric Laurent
efc42d3a5b am 7d987180: Merge change I19f2928b into eclair 
Merge commit '7d9871805beef4ea5e319f1a11ab32f610031845' into eclair-plus-aosp

* commit '7d9871805beef4ea5e319f1a11ab32f610031845':
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
 2009-09-29 15:18:10 -07:00
Android (Google) Code Review
7d9871805b Merge change I19f2928b into eclair 
* changes:
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
 2009-09-29 18:12:54 -04:00
Eric Laurent
a2ef57dba9 Fix issue 2141503: Keyclick sound doesn't honor volume settings. 
Use music stream volume minus 3 dB for sound effects if volume is not explicitly requested by application.
 2009-09-29 15:00:40 -07:00
Ray Chen
06e5b76667 am 0167263b: Merge change Ide90d0cc into eclair 
Merge commit '0167263bf457164a17f612ec551313f1b9e42972' into eclair-plus-aosp

* commit '0167263bf457164a17f612ec551313f1b9e42972':
  Unify Java NIO to read/write MiniThumbFile.
 2009-09-29 13:32:14 -07:00
Ray Chen
ecc97cc949 Unify Java NIO to read/write MiniThumbFile. 2009-09-29 13:11:20 -07:00
Marco Nelissen
14e8e988cf am 7d973514: Merge change 27449 into eclair 
Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp

* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
  Always consider m4a files as audio, even when they contain a video track.
 2009-09-28 09:27:10 -07:00
Android (Google) Code Review
7d9735142f Merge change 27449 into eclair 
* changes:
  Always consider m4a files as audio, even when they contain a video track.
 2009-09-28 12:24:08 -04:00
Marco Nelissen
1851db6804 Always consider m4a files as audio, even when they contain a video track. 2009-09-28 09:03:33 -07:00
Marco Nelissen
aa50713649 am dba93b68: Merge change 27318 into eclair 
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
  Check that playlist entries refer to a row in the audio table.
 2009-09-27 19:50:49 -07:00
Android (Google) Code Review
dba93b6832 Merge change 27318 into eclair 
* changes:
  Check that playlist entries refer to a row in the audio table.
 2009-09-27 22:43:05 -04:00
Marco Nelissen
d4f3586c93 Check that playlist entries refer to a row in the audio table. 2009-09-27 15:06:03 -07:00
Ray Chen
1055e0d830 am cc96652c: Remove fflush when storing thumbanil to sdcard. 
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
 2009-09-27 14:03:32 -07:00
Ray Chen
cc96652c70 Remove fflush when storing thumbanil to sdcard. 2009-09-27 13:41:25 -07:00
Marco Nelissen
c46f886b63 am 0faa5c6c: Merge change 27271 into eclair 
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
  Only scan windows media files when those codecs are enabled.
 2009-09-27 12:24:17 -07:00
Marco Nelissen
0ddbc35dc4 Only scan windows media files when those codecs are enabled. 2009-09-27 11:25:49 -07:00
Ray Chen
d503453ca0 am 80d8ace4: Merge change 26997 into eclair 
Merge commit '80d8ace484525f0272b8a56142ef838f5f4d38e4' into eclair-plus-aosp

* commit '80d8ace484525f0272b8a56142ef838f5f4d38e4':
  Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
 2009-09-24 21:26:27 -07:00
Ray Chen
343449f018 Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail. 2009-09-24 20:22:37 -07:00
Ray Chen
94cdc3d0e2 am 830207ca: Merge change 25635 into eclair 
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
 2009-09-23 11:38:06 -07:00
Ray Chen
00c575a3fc Add new thumbnail API. 2009-09-23 11:23:45 -07:00
Chih-Chung Chang
1e577ced7d am 7b7029e0: Merge change 26236 into eclair 
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.
 2009-09-22 09:59:46 -07:00
Chih-Chung Chang
b8f4725d1b Make media scanner read the jpeg orientation tag. 2009-09-22 04:42:02 +08:00
Chih-Chung Chang
8701202834 am f22b7410: Merge change 25464 into eclair 
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
 2009-09-18 12:02:50 -07:00
Chih-Chung Chang
872a30ec72 Improve ExifInterface API. 
Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
 2009-09-18 11:30:47 -07:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Jean-Baptiste Queru
ea5f767246 Update documentation for getVideoWidth and getVideoHeight. 
Ref: http://code.google.com/p/android/issues/detail?id=3024
 2009-09-16 15:06:25 -07:00
Chih-Chung Chang
d5423a9fc8 am fc5f1026: Merge change 25291 into eclair 
Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp

* commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70':
  Try to fix sdk build again.
 2009-09-16 10:32:14 -07:00
Android (Google) Code Review
fc5f10265f Merge change 25291 into eclair 
* changes:
  Try to fix sdk build again.
 2009-09-16 13:23:35 -04:00
Chih-Chung Chang
8bc2495e5e am de88c515: Merge change 25286 into eclair 
Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp

* commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df':
  Fix sdk build.
 2009-09-16 10:22:56 -07:00
Chih-Chung Chang
9081aec61f Try to fix sdk build again. 2009-09-17 01:20:05 +08:00
Android (Google) Code Review
de88c515ce Merge change 25286 into eclair 
* changes:
  Fix sdk build.
 2009-09-16 13:15:45 -04:00
Chih-Chung Chang
7b886f9e8c Fix sdk build. 2009-09-17 01:09:08 +08:00
Chih-Chung Chang
53a673661c am d3ba4811: Merge change 25272 into eclair 
Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
  Make ExifInterface public.
 2009-09-16 09:19:41 -07:00
Android (Google) Code Review
d3ba4811d4 Merge change 25272 into eclair 
* changes:
  Make ExifInterface public.
 2009-09-16 12:12:03 -04:00
Jean-Michel Trivi
2edbd217af am b53eaac6: Merge change 25155 into eclair 
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
 2009-09-16 09:10:31 -07:00
Android (Google) Code Review
b53eaac659 Merge change 25155 into eclair 
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
 2009-09-16 12:07:37 -04:00
Chih-Chung Chang
017bb4ccf7 Make ExifInterface public. 2009-09-16 23:38:34 +08:00
Chih-Chung Chang
e1c64f8f14 am ccd064d4: Merge change 25255 into eclair 
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
 2009-09-16 05:21:54 -07:00