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

5161 Commits

Author SHA1 Message Date
Jaikumar Ganesh
9d91706725 am 8de4e0ad: Merge change I21d0dca3 into eclair 
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-plus-aosp

* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
 2009-11-05 14:46:11 -08:00
Android (Google) Code Review
8de4e0ad8f Merge change I21d0dca3 into eclair 
* changes:
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
 2009-11-05 17:15:51 -05:00
Daniel Sandler
c10300235a am eca41b31: Merge change Id1458b01 into eclair 
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
 2009-11-05 13:00:39 -08:00
Daniel Sandler
18a509d8fa New live wallpaper API to expose author and description strings. 
First in a sequence of CLs to address
http://b/issue?id=2235307 .

Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
 2009-11-05 15:05:27 -05:00
Jaikumar Ganesh
21d0dca33e Add BMW kits made by Motorola PCS to autoblack list for Bluetooth. 
This may force some Motorola headsets to thow up the Pairing Request.

Bug: 2210365
Dr No: Eastham
 2009-11-05 11:30:18 -08:00
Eric Laurent
d889f189b5 am 67b69292: Merge change I93f500a5 into eclair 
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
 2009-11-05 00:01:50 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair 
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
 2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece. 
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
 2009-11-04 23:47:21 -08:00
Romain Guy
075b09a149 am 131564d2: Merge change I3bbfb4f9 into eclair 
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-plus-aosp

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 17:36:16 -08:00
Android (Google) Code Review
131564d26a Merge change I3bbfb4f9 into eclair 
* changes:
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 19:58:00 -05:00
Romain Guy
293451e4f0 Remove unused field and add new API to control the children drawing order. 
Approved by: xav, hackbod, mcleron.

Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
 2009-11-04 16:57:07 -08:00
Eric Olsen
5a301c0d17 am 9053fdb3: Merge change I76127f6f into eclair 
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-plus-aosp

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
 2009-11-04 16:46:49 -08:00
Eric Olsen
f42f15cf45 Add support for colored LED on jogball backlight. 
Signed-off-by: Eric Olsen <eolsen@android.com>
 2009-11-04 14:31:26 -08:00
Dirk Dougherty
16c7f4474e am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk 
Merge commit '5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-plus-aosp

* commit '5fc71e67498ed64ad2d41c23471b008f93cb580e':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
 2009-11-04 14:20:55 -08:00
Dirk Dougherty
5fc71e6749 am 00e44ef2: Merge change I54545dfd into eclair-sdk 
Merge commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair

* commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
 2009-11-04 14:12:29 -08:00
Android (Google) Code Review
00e44ef217 Merge change I54545dfd into eclair-sdk 
* changes:
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
 2009-11-04 17:04:41 -05:00
Romain Guy
5613fcb674 am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled. 
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-plus-aosp

* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
 2009-11-04 06:11:03 -08:00
Romain Guy
e1e0dc8e6e Make sure we relayout the TextView when the text changes and marquee is enabled. 
Bug #2192881.

Change-Id: Iffc2d15947a11974d9dc175740e3a5489cd43d21
 2009-11-03 17:24:55 -08:00
Dirk Dougherty
59ad275e93 doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup. 
Bug: 2230588
Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
 2009-11-03 15:33:37 -08:00
Romain Guy
7239d4105a am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-plus-aosp

* commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84':
  Unhide View.isOpaque().
 2009-11-03 12:15:32 -08:00
Romain Guy
732046f874 Unhide View.isOpaque(). 
Change-Id: I96444af2a7e66a330a2c4b3fa0a173ec5ab4ed40
 2009-11-03 12:09:04 -08:00
Evan Millar
173c8af8ea am 326eaa33: Merge change I0fae86b8 into eclair 
Merge commit '326eaa334da566c3dcae29b17f255c63c8bb919a' into eclair-plus-aosp

* commit '326eaa334da566c3dcae29b17f255c63c8bb919a':
  Make QuickContact styles public.
 2009-11-03 11:04:39 -08:00
Android (Google) Code Review
326eaa334d Merge change I0fae86b8 into eclair 
* changes:
  Make QuickContact styles public.
 2009-11-03 13:58:03 -05:00
Evan Millar
0fae86b80f Make QuickContact styles public. 
This should have been done for the 2.0 sdk, but fell through the cracks.
Fortunately this will make it into the 2.1 sdk.
 2009-11-03 09:49:43 -08:00
Mike Lockwood
3580ee41f1 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair 
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-plus-aosp

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
 2009-11-03 09:37:39 -08:00
Mike Lockwood
f90ffcc639 Remove obsolete hardware auto-brightness support. 
Change-Id: Ibd0ef67f887254f26ce19faf0627f8b246ec0a18
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-03 11:41:27 -05:00
Mike Lockwood
4115c51875 Add documentation for proximity and light sensors. 
Change-Id: I116424c468d1d3afe89e0e17be773ee8b80ada92
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-03 10:36:24 -05:00
Dirk Dougherty
f93cf36964 am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
 2009-11-02 18:27:55 -08:00
Dirk Dougherty
483d29c0dd am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair

* commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b':
  doc change: misc doc fixes.
 2009-11-02 18:17:26 -08:00
Jaikumar Ganesh
2cc3693d43 am a229ceda: Merge change I73d6c0f8 into eclair 
Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-plus-aosp

* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 15:54:33 -08:00
Android (Google) Code Review
a229cedadd Merge change I73d6c0f8 into eclair 
* changes:
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 18:46:04 -05:00
Dianne Hackborn
efb752570e am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-plus-aosp

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 10:52:30 -08:00
Android (Google) Code Review
b6a6791f38 Merge change I60413727 into eclair 
* changes:
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 13:43:52 -05:00
Dianne Hackborn
553399518f Fix issue #2226370: Resource versions match with equality 
Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
 2009-11-01 21:16:59 -08:00
Dirk Dougherty
6b13bc043e doc change: misc doc fixes. 
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
 2009-10-30 19:44:22 -07:00
Mike LeBeau
b09123255e am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-plus-aosp

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:21:18 -07:00
Android (Google) Code Review
d3e4dab962 Merge change I7df84618 into eclair 
* changes:
  Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
 2009-10-30 21:12:00 -04:00
Jack Wang
1d225d67d9 am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-plus-aosp

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:21 -07:00
Android (Google) Code Review
e8228afb2b Merge change I92cdc5ed into eclair 
* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 20:02:13 -04:00
Mike LeBeau
7df846186d Add a privateImeOption to represent that the IME should not show 
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).

The IME will respect this shortly.

http://b/2228562
 2009-10-30 16:11:40 -07:00
Jaikumar Ganesh
73d6c0f81f Add ability to disable sending Photos using Vcard. Do Not Merge 
This to fix PBAP support for some car kits which are unable
to handle contacts with photos.
Original Change by: Yue Lixin

Bug: 2183320
Dr No: Eastham
 2009-10-30 15:28:27 -07:00
Mike Reed
9b1e9d8e79 am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-plus-aosp

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
 2009-10-30 14:13:53 -07:00
Android (Google) Code Review
1864d01f2b Merge change Iae849da2 into eclair 
* changes:
  add table maskfilter
 2009-10-30 17:03:18 -04:00
Jaikumar Ganesh
97b41f0da9 am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-plus-aosp

* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
  Revert the channge where channels were not selected randomly.
 2009-10-30 10:33:52 -07:00
Android (Google) Code Review
3cf254d2ba Merge change I4b3db907 into eclair 
* changes:
  Revert the channge where channels were not selected randomly.
 2009-10-30 13:23:43 -04:00
Jaikumar Ganesh
4b3db907f0 Revert the channge where channels were not selected randomly. 
The Bluez SDP bug has been fixed.
Reverting parts of the commit: 16fb88a673c41b93c5d57ccb28c2697e7d87701a

Bug: 2173752
Dr No: Eastham
 2009-10-30 09:37:25 -07:00
Mike Reed
0e1e623011 add table maskfilter 
hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
 2009-10-30 08:11:58 -04:00
Jeff Sharkey
a64ebedf4a am 824838d7: Avoid NPE when callers send null selection args. 
Merge commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b' into eclair-plus-aosp

* commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b':
  Avoid NPE when callers send null selection args.
 2009-10-29 18:11:12 -07:00
Jeff Sharkey
824838d74e Avoid NPE when callers send null selection args. 
Fixes http://b/2226007
 2009-10-29 17:38:27 -07:00
Fred Quintana
e2c25a2307 am fae288c7: Merge change I9efe265f into eclair 
Merge commit 'fae288c7987f96df05e91ed154e934de267098be' into eclair-plus-aosp

* commit 'fae288c7987f96df05e91ed154e934de267098be':
  unhide AccountManagerResponse
 2009-10-29 15:00:27 -07:00