16413 Commits

Author SHA1 Message Date
Scott Main
6e1ae685d9 am e46b2853: am 26099cd9: Merge change I7d67e1b3 into eclair
Merge commit 'e46b2853deff2dde83d20616b6023984fdd6c19c'

* commit 'e46b2853deff2dde83d20616b6023984fdd6c19c':
  docs: small edits
2009-12-16 18:25:39 -08:00
Scott Main
e46b2853de am 26099cd9: Merge change I7d67e1b3 into eclair
Merge commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c' into eclair-plus-aosp

* commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c':
  docs: small edits
2009-12-16 18:22:44 -08:00
Android (Google) Code Review
26099cd9ce Merge change I7d67e1b3 into eclair
* changes:
  docs: small edits
2009-12-16 18:20:05 -08:00
Scott Main
7d67e1b365 docs: small edits 2009-12-16 18:14:37 -08:00
Lixin Yue
e06dd2ccaf am 8fb44ae8: am 492604e9: Merge change I69f72c00 into eclair-mr2
Merge commit '8fb44ae8bb9401eb90e24bdf02482cf28d50ece9'

* commit '8fb44ae8bb9401eb90e24bdf02482cf28d50ece9':
  Update OBEX lib setPath Flags handling logic to be compatible with spec.
2009-12-16 17:42:41 -08:00
Lixin Yue
8fb44ae8bb am 492604e9: Merge change I69f72c00 into eclair-mr2
Merge commit '492604e95239c1427dd5acb9109eb8acaaafc50d' into eclair-mr2-plus-aosp

* commit '492604e95239c1427dd5acb9109eb8acaaafc50d':
  Update OBEX lib setPath Flags handling logic to be compatible with spec.
2009-12-16 17:39:18 -08:00
Android (Google) Code Review
492604e952 Merge change I69f72c00 into eclair-mr2
* changes:
  Update OBEX lib setPath Flags handling logic to be compatible with spec.
2009-12-16 17:36:16 -08:00
Lixin Yue
69f72c00a1 Update OBEX lib setPath Flags handling logic to be compatible with spec.
From IrOBEX, 3.3.6.1, we can see below explanation for Flags bit 1:
1  Don't create directory if it does not exist, return an error instead.
The correct understanding should be: if bit 1 is set to 1, we'll not create
directory if it not exist; if bit 1 is set to 0, we'll create it if it not
exists.
2009-12-16 17:33:02 -08:00
Jaikumar Ganesh
ef3308790a am 57043a67: am 43ad522d: Merge change Ic0e32f12 into eclair-mr2
Merge commit '57043a675f8826099e619c5d325fc7670be83e0b'

* commit '57043a675f8826099e619c5d325fc7670be83e0b':
  Add a callback for the ConnectSink Call.
2009-12-16 16:31:25 -08:00
Grace Kloba
f432b6db33 am 4eb5f387: am 601112f2: Merge change I11438c37 into eclair-mr2
Merge commit '4eb5f38788e2b40339ab29cbfbae36e7741659c6'

* commit '4eb5f38788e2b40339ab29cbfbae36e7741659c6':
  Implement the full screen WebView plugin.
2009-12-16 16:31:12 -08:00
Jaikumar Ganesh
57043a675f am 43ad522d: Merge change Ic0e32f12 into eclair-mr2
Merge commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3' into eclair-mr2-plus-aosp

* commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3':
  Add a callback for the ConnectSink Call.
2009-12-16 16:27:14 -08:00
Android (Google) Code Review
b3da414f6d Merge change I64bf3d53
* changes:
  Add FW log dump for bcm4329
2009-12-16 16:26:04 -08:00
Android (Google) Code Review
43ad522d49 Merge change Ic0e32f12 into eclair-mr2
* changes:
  Add a callback for the ConnectSink Call.
2009-12-16 16:22:17 -08:00
Dmitry Shmidt
64bf3d53d5 Add FW log dump for bcm4329
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2009-12-16 16:05:08 -08:00
Android (Google) Code Review
4769f6ef5e Merge change Ie3ab4d0f
* changes:
  Restore live wallpapers if specified in the restore data
2009-12-16 16:01:58 -08:00
Android (Google) Code Review
b9bbb638c3 Merge change I8bb41dd6
* changes:
  Add argument checking to sampler builder to disallow illegal modes.
2009-12-16 16:01:26 -08:00
Jason Sams
8bb41dd614 Add argument checking to sampler builder to disallow illegal modes. 2009-12-16 15:59:59 -08:00
Scott Main
4c83f40bdb am 7ddb938c: am b2aab504: Merge change I354261e2 into eclair
Merge commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9'

* commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9':
  docs: small edit to live wallpaper sentence
2009-12-16 15:52:32 -08:00
Trevor Johns
15e1e70532 am 50e72439: am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
Merge commit '50e72439648dc36205ad307a07f3050270346308'

* commit '50e72439648dc36205ad307a07f3050270346308':
  Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:52:22 -08:00
Android (Google) Code Review
21326822f7 Merge change I7b7f29a3
* changes:
  Fix live wallpaper many.  Z coordinate was being ignored for draw quad call.
2009-12-16 15:36:43 -08:00
Scott Main
7ddb938c6c am b2aab504: Merge change I354261e2 into eclair
Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp

* commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7':
  docs: small edit to live wallpaper sentence
2009-12-16 15:32:22 -08:00
Trevor Johns
50e7243964 am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
Merge commit '5ff60dff181fc4982c822ef97e14a293af66a246' into eclair-plus-aosp

* commit '5ff60dff181fc4982c822ef97e14a293af66a246':
  Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:32:16 -08:00
Android (Google) Code Review
b2aab5042b Merge change I354261e2 into eclair
* changes:
  docs: small edit to live wallpaper sentence
2009-12-16 15:30:02 -08:00
Scott Main
354261e25a docs: small edit to live wallpaper sentence 2009-12-16 15:25:35 -08:00
Trevor Johns
5ff60dff18 Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678. 2009-12-16 15:14:43 -08:00
Android (Google) Code Review
8cdbc2af94 Merge change I7fa1f88b
* changes:
  Fix preloading after https://android-git.corp.google.com/g/35674.
2009-12-16 14:29:39 -08:00
Jason Sams
7b7f29a35c Fix live wallpaper many. Z coordinate was being ignored for draw quad call. 2009-12-16 14:24:17 -08:00
Grace Kloba
4eb5f38788 am 601112f2: Merge change I11438c37 into eclair-mr2
Merge commit '601112f213035851a2fa2c2281c7f56cf767b14a' into eclair-mr2-plus-aosp

* commit '601112f213035851a2fa2c2281c7f56cf767b14a':
  Implement the full screen WebView plugin.
2009-12-16 14:15:29 -08:00
Android (Google) Code Review
d621c751e3 Merge change Ice9adcce
* changes:
  Fix emulated glColor in es2 mode.
2009-12-16 14:13:54 -08:00
Elliott Hughes
7fa1f88b48 Fix preloading after https://android-git.corp.google.com/g/35674.
Josh removed the useless valueOfCache classes from the library, but not from
the preload list.
2009-12-16 14:13:17 -08:00
Jason Sams
ce9adcce02 Fix emulated glColor in es2 mode. 2009-12-16 14:13:06 -08:00
Android (Google) Code Review
601112f213 Merge change I11438c37 into eclair-mr2
* changes:
  Implement the full screen WebView plugin.
2009-12-16 14:11:34 -08:00
Christopher Tate
e3ab4d0f18 Restore live wallpapers if specified in the restore data 2009-12-16 14:03:31 -08:00
Android (Google) Code Review
170dcbcad4 Merge change I987dbde8
* changes:
  Fix full stagefright build in master, various warnings/errors in omx_jpeg_decoder
2009-12-16 13:25:16 -08:00
Andreas Huber
987dbde838 Fix full stagefright build in master, various warnings/errors in omx_jpeg_decoder 2009-12-16 13:13:27 -08:00
Xavier Ducrohet
009909b417 am b43b35a0: am e6547423: Merge change I10073d50 into eclair
Merge commit 'b43b35a034ad667ba749270537155e7534906153'

* commit 'b43b35a034ad667ba749270537155e7534906153':
  Add Annotation for optional features.
2009-12-16 12:19:52 -08:00
Xavier Ducrohet
b43b35a034 am e6547423: Merge change I10073d50 into eclair
Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp

* commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3':
  Add Annotation for optional features.
2009-12-16 12:16:24 -08:00
Android (Google) Code Review
e6547423e3 Merge change I10073d50 into eclair
* changes:
  Add Annotation for optional features.
2009-12-16 12:14:11 -08:00
Jaikumar Ganesh
c0e32f1243 Add a callback for the ConnectSink Call.
This takes care of the conditions where the bluez audio drivers
are not up and we try to make the call to connect the sink.
This would get rid of the hack in Settings app.
2009-12-16 11:42:06 -08:00
Grace Kloba
11438c371e Implement the full screen WebView plugin.
Use a NoTitleBar_Fullscreen dialog to implement the
full screen plugin. This runs in the same thread as
WebView (UI in the Browser case). One catch is that
the SurfaceView provided by the plugin needs to be
opaque if it doesn't want to see through the WebView.

The PluginFullScreenHolder translates the events to
the underline WebView. Special treatment in the touch
case as it needs to translate the coordinates.

WebView can't be panned, or double tap to zoom, or
long press to trigger the context menu while having
a full screen plugin.

Inside webkit, we also give the plugin element focus
when it goes to the full screen so that it takes key
events. While handling key events, we don't let it 
loose focus or scroll out.

Todo:
When a plugin goes to full screen, we should make
sure the embedded plugin is fully visible. Otherwise
when we translate the touch events back, they will be
outside of the visible rect and will be ignored.

This is part 1 of 2-project check in.
2009-12-16 11:39:12 -08:00
Scott Main
2786d21dde am 18a27886: am 8bda0fb0: Merge change Iccb92649 into eclair
Merge commit '18a27886952ba7fb78174508c5348959b31a73ef'

* commit '18a27886952ba7fb78174508c5348959b31a73ef':
  docs: fix typo
2009-12-16 11:20:30 -08:00
Scott Main
1e5710ce6f am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair
Merge commit '73536dda20594e4b5e83396d705127a823bfa362'

* commit '73536dda20594e4b5e83396d705127a823bfa362':
  docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:20:22 -08:00
Scott Main
18a2788695 am 8bda0fb0: Merge change Iccb92649 into eclair
Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp

* commit '8bda0fb0ca24875ad6084f35250f166b45f967a1':
  docs: fix typo
2009-12-16 11:18:00 -08:00
Scott Main
73536dda20 am d92cc9a4: Merge change I33eb64c0 into eclair
Merge commit 'd92cc9a4ba2cf38f133cc2b51fe1cd0be8659db9' into eclair-plus-aosp

* commit 'd92cc9a4ba2cf38f133cc2b51fe1cd0be8659db9':
  docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:17:54 -08:00
Android (Google) Code Review
8bda0fb0ca Merge change Iccb92649 into eclair
* changes:
  docs: fix typo
2009-12-16 11:14:40 -08:00
Scott Main
ccb926498f docs: fix typo 2009-12-16 11:13:40 -08:00
Android (Google) Code Review
71939987a8 Merge change I5dad8b4d
* changes:
  Place shader logging behind prop to declutter logs.
2009-12-16 11:12:16 -08:00
Scott Main
81e886aa3d am eab4fe7a: am 4c4a47f4: docs: add developer dashboard page and add topic link to it from the homepage (replacing the video topic)
Merge commit 'eab4fe7a425532717bfc948430de73637ed81c84'

* commit 'eab4fe7a425532717bfc948430de73637ed81c84':
  docs: add developer dashboard page and add topic link
2009-12-16 11:11:35 -08:00
Android (Google) Code Review
d92cc9a4ba Merge change I33eb64c0 into eclair
* changes:
  docs: add 2.1 platform notes, win usb driver notes  and fix some javadocs for PhonestateListener
2009-12-16 11:11:02 -08:00
Scott Main
c49f864695 resolved conflicts for merge of aaf8a9d8 to master 2009-12-16 11:08:26 -08:00