Commit Graph

31289 Commits

Author SHA1 Message Date
James Dong
2cc930bd40 Merge "Add the default back-facing camera to the MediaProfile camera vector As a result, missing media_profiles.xml will be still allowed." 2011-03-07 17:24:02 -08:00
Wink Saville
5568d10c63 Merge "Have createAllDataConnectionList create the RetryManager inside the loop." 2011-03-07 16:40:45 -08:00
Adam Powell
beb0afd885 am 3314a313: am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
* commit '3314a31377e60ee11335cc51a2e3dba86b36bb7e':
  Fix bug 4021346 - crash while navigating
2011-03-07 16:30:33 -08:00
Adam Powell
08d0a42e4f am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
* commit 'a46c1df226f2aea54d3bb068b0537c9b1d28590c':
  Fix bug 4021346 - crash while navigating
2011-03-07 16:27:36 -08:00
Jeff Brown
8163b31972 Merge "Make PointerLocationView also log generic motions and some keys." 2011-03-07 16:26:13 -08:00
Adam Powell
5487a1eeef Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1 2011-03-07 16:25:20 -08:00
Chia-chi Yeh
fff566cdb9 am 0588f16b: am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
* commit '0588f16b5699f24f4524a3c308bf32feb3be29c9':
  NEW_API: Unhide RTP APIs.
2011-03-07 15:44:35 -08:00
Chia-chi Yeh
110603b2c2 am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
* commit 'ab7c3245ed7a725406a58826382471105c725468':
  NEW_API: Unhide RTP APIs.
2011-03-07 15:41:50 -08:00
Chia-chi Yeh
8b5a2265fe Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1 2011-03-07 15:39:54 -08:00
Adam Powell
dec59e2b67 am 6fd61629: am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
* commit '6fd61629b34881bf5c454ca4aaa7dacfe1656679':
  Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:11:54 -08:00
Adam Powell
bdc2be5440 am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
* commit '43a811979d55587e014134f6050dc90ca918f9ce':
  Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:09:28 -08:00
Adam Powell
6ac14a6ed9 Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1 2011-03-07 15:06:02 -08:00
James Dong
1010c71709 am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
* commit 'a7c9dffdb8097105482ce976ba0a51baa76d8806':
  Add missing copyright headers to a couple of files
2011-03-07 14:45:51 -08:00
James Dong
0c8b091141 am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
* commit '4ed072f904b5344ce4ef6f832c618a1d3f43867d':
  Add missing copyright headers to a couple of files
2011-03-07 14:44:02 -08:00
James Dong
ae1699dbf7 Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1 2011-03-07 14:41:50 -08:00
Leon Scroggins
f0c16cb100 am 0645e28d: (-s ours) am 6478e4f0: Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
* commit '0645e28d5a6776578afef03a796786f3f9e9eba8':
  New button assets for webview. DO NOT MERGE
2011-03-07 13:52:37 -08:00
Wink Saville
1abbbf1f65 Merge "Remove mRetryMgr and directly use DataConnection retry mgr." 2011-03-07 13:51:11 -08:00
Leon Scroggins
a2b419de24 am 6478e4f0: Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
* commit '6478e4f0b0a6d34251ca0125eb6067f038e344aa':
  New button assets for webview. DO NOT MERGE
2011-03-07 13:49:52 -08:00
Leon Scroggins
47c8659af9 Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1 2011-03-07 13:47:30 -08:00
Gloria Wang
b8c5047cb7 am 57a72699: am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
* commit '57a7269965ace798992809544630d6719d84760d':
  To support uri started with http:// in some Java APIs Fix for bug 4016388.
2011-03-07 13:36:27 -08:00
Mike Lockwood
202de82837 am 1cdb2929: am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
* commit '1cdb2929f368a1ab1c30e89200e585fcb1278492':
  MtpClient: Fix problem with getDeviceList() returning empty result in some cases
2011-03-07 13:36:20 -08:00
Gloria Wang
273ebe4d4a am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
* commit 'd686c31bf3da56378e174265889db9bca8e636a3':
  To support uri started with http:// in some Java APIs Fix for bug 4016388.
2011-03-07 13:32:27 -08:00
Mike Lockwood
324e53d347 am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
* commit '11cb5cb9e322bb06c5006225e8c8ef3f7291ee96':
  MtpClient: Fix problem with getDeviceList() returning empty result in some cases
2011-03-07 13:29:39 -08:00
Gloria Wang
276ed6b932 Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1 2011-03-07 13:28:27 -08:00
Mike Lockwood
f069e16f65 Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1 2011-03-07 13:23:40 -08:00
Eric Fischer
a3d7f0fac8 am 48eb658b: (-s ours) am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '48eb658bd9eedf0ef0e03613a21604e238cb0360':
  Import revised translations.  DO NOT MERGE
2011-03-07 13:17:56 -08:00
Eric Fischer
7eb0016962 am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'c5f7f582a6b7632c34270a9d1edb04bc4b7e2640':
  Import revised translations.  DO NOT MERGE
2011-03-07 13:07:58 -08:00
Eric Fischer
3ac00ae144 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-07 13:03:44 -08:00
Vasu Nori
e35a665855 am f114e67e: am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
* commit 'f114e67edd85e874b54f0a7061addf4b43d35076':
  bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:55:38 -08:00
Vasu Nori
e530350db4 am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
* commit '0f73fe1c847f260d52675ffc1ef54b6daf136772':
  bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:51:50 -08:00
Vasu Nori
afef62258c Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1 2011-03-07 12:46:59 -08:00
Patrick Dubroy
a71556c6b1 am aca79826: am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
* commit 'aca79826484ee8eaaae42beabe1b21fdc5fbbab7':
  Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:56:42 -08:00
Patrick Dubroy
281de2f65d am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
* commit '19960989e2c5ad60e4d05ebb3b31bc25ecd751af':
  Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:54:22 -08:00
Jeff Brown
b2be540457 am fd47c5ee: (-s ours) am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
* commit 'fd47c5eea2a4393b5c9897bb80db721809146aaf':
  Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:52:07 -08:00
Patrick Dubroy
96e84c47a8 Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1 2011-03-07 11:51:50 -08:00
Jeff Brown
a9b2898ebf am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
* commit 'f0210c36218c03dc30e444ef85690dc815097920':
  Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:49:52 -08:00
Jeff Brown
51a4a2fef8 Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1 2011-03-07 11:47:58 -08:00
satok
855171bb57 Merge "Fix a test for system properties in frameworks/base/core" 2011-03-07 11:41:02 -08:00
Romain Guy
9d48708e28 am 15c6b719: am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
* commit '15c6b719fe8d1f4b27b4fa66ac94eede3957caf2':
  Remove many unnecessary save/restore calls.
2011-03-07 11:28:13 -08:00
Romain Guy
3919d9577c am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
* commit '0aaa11ed5be45170fb2535a6ce021c92b18d8878':
  Remove many unnecessary save/restore calls.
2011-03-07 11:25:41 -08:00
Romain Guy
a7e4eecb9e Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1 2011-03-07 11:24:02 -08:00
Soojung Shin
8ba0aca94f am 3fe49d81: am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
* commit '3fe49d8168ab7344d495ea5ee8ed6b9ef3145495':
  Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:16:07 -08:00
Soojung Shin
82009fc2a8 am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
* commit 'fa680a18f617de202912b8a9fe3fc0890a9fe09e':
  Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:10:28 -08:00
Andreas Huber
6757e62574 Merge "Added more metadata published by the MediaMetaDataRetriever" 2011-03-07 11:03:28 -08:00
Daniel Sandler
44cb1bcdfe am a1a998af: am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
* commit 'a1a998af3b47ecec4ee3f65eda723b7cb50e7699':
  When the user touches a peeked notification, reset the fadeout timer.
  Fix touches on glowing region around panel.
2011-03-07 10:54:36 -08:00
Daniel Sandler
1c1a1a73e0 am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
* commit 'ec1f1f4cfc6e253cee4320fe33a385d2218a9bb2':
  When the user touches a peeked notification, reset the fadeout timer.
  Fix touches on glowing region around panel.
2011-03-07 10:50:54 -08:00
Daniel Sandler
9bcade1d19 Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
* changes:
  When the user touches a peeked notification, reset the fadeout timer.
  Fix touches on glowing region around panel.
2011-03-07 10:47:13 -08:00
Winson Chung
98d0d9865c am c7dcd70a: am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
* commit 'c7dcd70a7801438f62e28883b28b3f457055785a':
  Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:27:50 -08:00
Adam Powell
a779826d5b am 1c94feb0: am 9ab91b84: Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
* commit '1c94feb04f20c0c3e193746a6f413557f4d12a30':
  Fix bug 3509417 - Serialize touch event handling in webview
2011-03-07 10:25:16 -08:00
Winson Chung
eb40916cba am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
* commit 'd452dbc2b62a9ddf7558965404f69f9a5e4ad1f5':
  Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:24:42 -08:00