Commit Graph

5814 Commits

Author SHA1 Message Date
Android (Google) Code Review
b2eccea36e Merge change I7c7b1596 into eclair
* changes:
  Fix a warning output.
2009-09-28 16:49:16 -04:00
Nick Pelly
8f637347f5 am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10' into eclair-plus-aosp

* commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10':
  Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-28 13:19:15 -07:00
Bjorn Bringert
d4ed8958a0 am 2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp

* commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
  Pass limit=50 to all suggestion sources.
2009-09-28 12:54:37 -07:00
Android (Google) Code Review
4bd45349e4 Merge change Ida50e915 into eclair
* changes:
  Pass limit=50 to all suggestion sources.
2009-09-28 15:47:56 -04:00
Bjorn Bringert
75f87e7422 am 9d686c93: Merge change 27474 into eclair
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp

* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 11:49:43 -07:00
Mike Cleron
b79b874a63 am 3ecd58c6: Fix build
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp

* commit '3ecd58c650371206008efd687933c370e4e28a34':
  Fix build
2009-09-28 11:49:36 -07:00
Evan Millar
a4c79e1168 am 14f65ff9: Merge change 27243 into eclair
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp

* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:49:29 -07:00
James Dong
09f69b715e am 99638e74: Merge change 27466 into eclair
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp

* commit '99638e747251929191f7773d2a81bbea223f1e09':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:49:22 -07:00
Android (Google) Code Review
d83a6d25f8 Merge change 27474 into eclair
* changes:
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 14:46:43 -04:00
Android (Google) Code Review
ed44a047c0 Merge change 27243 into eclair
* changes:
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 14:44:42 -04:00
Android (Google) Code Review
bc3a0fed68 Merge change 27466 into eclair
* changes:
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 14:40:34 -04:00
Amith Yamasani
f3833e5db8 am fedb3269: Merge change 27349 into eclair
Merge commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f' into eclair-plus-aosp

* commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f':
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:16:53 -07:00
Nick Pelly
2574142eb9 am 96e42b3a: Merge change 27462 into eclair
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp

* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:16:45 -07:00
Android (Google) Code Review
1c0dcf0445 Merge change 27349 into eclair
* changes:
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 14:12:03 -04:00
Android (Google) Code Review
f52224afea Merge change 27462 into eclair
* changes:
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 14:09:47 -04:00
Mike Cleron
161b537312 am f116bf88: Fading scrollbars return. But you have to opt in.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp

* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
  Fading scrollbars return. But you have to opt in.
2009-09-28 11:07:14 -07:00
Andrei Popescu
55312676c0 am 5d062bc3: Merge change 27426 into eclair
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp

* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
  Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:42:13 -07:00
Android (Google) Code Review
029f39b5c9 Merge change 27426 into eclair
* changes:
  Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().
2009-09-28 13:33:01 -04:00
Grace Kloba
0783b7e05f am 0d03b914: Before we send VIEW_SIZE_CHANGED after first layout, we should remove VIEW_SIZE_CHANGED in the queue if there is any as we are going to send the message in the front of the queue.
Merge commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1' into eclair-plus-aosp

* commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1':
  Before we send VIEW_SIZE_CHANGED after first layout,
2009-09-28 10:15:00 -07:00
Suchi Amalapurapu
656f1bdf67 am fee73ee2: Merge change 27411 into eclair
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp

* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
  Cache inflated view to avoid inflation of layouts in preferences
2009-09-28 10:14:53 -07:00
Guang Zhu
29258177c7 am 1cdb55aa: Merge change 27457 into eclair
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp

* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 10:14:47 -07:00
Android (Google) Code Review
a61e88f472 Merge change 27411 into eclair
* changes:
  Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
2009-09-28 13:07:16 -04:00
Android (Google) Code Review
04140fa163 Merge change 27457 into eclair
* changes:
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 12:56:02 -04:00
Grace Kloba
1ad283c10a am 207308a7: WebView may get message after destroy() is called. Just return in this case.
Merge commit '207308a781621c427acccbd9983c2511a65e9137' into eclair-plus-aosp

* commit '207308a781621c427acccbd9983c2511a65e9137':
  WebView may get message after destroy() is called.
2009-09-28 09:49:53 -07:00
Andrew Stadler
35aa3fe1a9 am 3fd2a81e: Merge change 27410 into eclair
Merge commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c' into eclair-plus-aosp

* commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c':
  Add extension->mime type mappings
2009-09-28 09:49:46 -07:00
Android (Google) Code Review
8bcb650279 Merge change 27410 into eclair
* changes:
  Add extension->mime type mappings
2009-09-28 12:27:45 -04:00
Marco Nelissen
710f854ff6 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
Guang Zhu
62d798068a am c18b0ebc: Merge change 27185 into eclair
Merge commit 'c18b0ebcfb905cc5001618c78890e884a859e069' into eclair-plus-aosp

* commit 'c18b0ebcfb905cc5001618c78890e884a859e069':
  Add checks for double-dumping on webkit data.
2009-09-28 09:27:04 -07:00
Android (Google) Code Review
d6b20b12f5 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
Android (Google) Code Review
f09a8c09d9 Merge change 27185 into eclair
* changes:
  Add checks for double-dumping on webkit data.
2009-09-28 12:21:30 -04:00
Daniel Sandler
b2fab923cf am b19774d5: Updated status bar graphics (drop date 9/25/09).
Merge commit 'b19774d520bde5bb12d80417788d9a773e123c14' into eclair-plus-aosp

* commit 'b19774d520bde5bb12d80417788d9a773e123c14':
  Updated status bar graphics (drop date 9/25/09).
2009-09-28 07:46:20 -07:00
Mathias Agopian
1058ea6040 am 81384bf9: don\'t emit GL commands when sf is in freeze mode
Merge commit '81384bf927c47a4efa653b14273084a13e67e3ac' into eclair-plus-aosp

* commit '81384bf927c47a4efa653b14273084a13e67e3ac':
  don't emit GL commands when sf is in freeze mode
2009-09-27 23:06:42 -07:00
Mathias Agopian
8a77baaa11 don't emit GL commands when sf is in freeze mode
We were emitting GL commands, calling composition complete and releasing clients
without ever calling eglSwapBuffers(), which is completely wrong on non-direct
renders. This could cause transient drawing artifacts when unfreezing the
screen (upon orientaion change for instance) and could also block the clients
for ever as they are waiting for their previous buffer to be rendered.
2009-09-27 22:47:32 -07:00
Mathias Agopian
04e40d97b2 am 1a3c8950: Merge change 27387 into eclair
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp

* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
2009-09-27 20:23:55 -07:00
Dmitri Plotnikov
23c06eb0d5 am a60479d2: Fixing broken javadoc.
Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp

* commit 'a60479d2ea7857455ebad6c56e357d00b0492364':
  Fixing broken javadoc.
2009-09-27 20:23:49 -07:00
Android (Google) Code Review
0d0952445b Merge change 27387 into eclair
* changes:
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
2009-09-27 23:19:49 -04:00
Mathias Agopian
56fa27572a fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Also set max swap interval to 1, which is the only supported value currently.
2009-09-27 20:18:16 -07:00
Dmitri Plotnikov
cfc26be70b am 879664e3: Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp

* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
  Adding columns to support attribution of status updates.  Also renaming some columns to better describe their purpose.
2009-09-27 19:55:51 -07:00
Marco Nelissen
0458b1b879 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
0ad7990247 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
Wu-cheng Li
5118b3b77f am e883847f: Merge change 27292 into eclair
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp

* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
  Add documentation about flash and change video-light to torch.
2009-09-27 19:22:12 -07:00
Android (Google) Code Review
e5a6fcc80e Merge change 27292 into eclair
* changes:
  Add documentation about flash and change video-light to torch.
2009-09-27 22:13:43 -04:00
Mathias Agopian
55a20b691a am 960972d4: Merge change 27375 into eclair
Merge commit '960972d465d6890d51c73fc08dda7fb17825ce7f' into eclair-plus-aosp

* commit '960972d465d6890d51c73fc08dda7fb17825ce7f':
  Allways dump the list of allocated buffers when an allocation fails.
2009-09-27 18:54:02 -07:00
Android (Google) Code Review
ff5054c81e Merge change 27375 into eclair
* changes:
  Allways dump the list of allocated buffers when an allocation fails.
2009-09-27 21:47:29 -04:00
Mathias Agopian
737e786acf Allways dump the list of allocated buffers when an allocation fails.
Hopefully this will help us understand cases of failures such as [2148405]
2009-09-27 18:44:09 -07:00
Jason Sams
136d6329ed am 41c64ba7: Merge change 27364 into eclair
Merge commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb' into eclair-plus-aosp

* commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb':
  Improve logging code to dump more detaild rs object info.  Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
2009-09-27 18:10:56 -07:00
Android (Google) Code Review
72cffcb701 Merge change 27364 into eclair
* changes:
  Improve logging code to dump more detaild rs object info.  Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
2009-09-27 21:04:09 -04:00
Doug Zongker
7d593afbb6 am a78fcccd: Merge change 27348 into eclair
Merge commit 'a78fcccde4131d83681eabe17ec32a3900f5289e' into eclair-plus-aosp

* commit 'a78fcccde4131d83681eabe17ec32a3900f5289e':
  fix "pacakge" typo in error log message
2009-09-27 18:02:15 -07:00
Android (Google) Code Review
de472a870f Merge change 27348 into eclair
* changes:
  fix "pacakge" typo in error log message
2009-09-27 20:56:57 -04:00
Dianne Hackborn
53b9fa34d3 am 02541fe6: Merge change 27351 into eclair
Merge commit '02541fe6a256eef2eab37f3aafc1916a46d65c1a' into eclair-plus-aosp

* commit '02541fe6a256eef2eab37f3aafc1916a46d65c1a':
  Allow wallpaper picker to work.
2009-09-27 17:13:47 -07:00