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

48935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
dfad483298 Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame." 2011-04-12 08:36:59 -07:00
Benoit Goby
2ab632a67e am 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '0b9b8711a1a2107dc913cc751b7d981fce4f3082':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:26:41 -07:00
Benoit Goby
0b9b8711a1 am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:23:42 -07:00
Benoit Goby
43be7a6120 EthernetDataTracker: implement setDependencyMet 
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
 2011-04-11 20:13:10 -07:00
Benoit Goby
dd0cd5e27e resolved conflicts for merge of 31659471 to master 
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
 2011-04-11 19:07:11 -07:00
Benoit Goby
316594715d am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
 2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
 2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
a944e591fc am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '07c25b651216daac884bd503c02b788418165b50':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:32:37 -07:00
Xavier Ducrohet
da64f6cf3c am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp 
* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
  LayoutLib: don't render when shader's local matrix is set to 0 scale.
 2011-04-11 17:28:59 -07:00
Elliott Hughes
4a1ba21044 Merge "You don't need to poke around inside FileDescriptor manually." 2011-04-11 17:27:53 -07:00
Brad Fitzpatrick
07c25b6512 am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '4430670f48f75661293371dab8db55865f5f56e0':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:27:12 -07:00
Xavier Ducrohet
1f2a307b59 resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp 
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
 2011-04-11 17:11:41 -07:00
Elliott Hughes
a3804cf77f You don't need to poke around inside FileDescriptor manually. 
We can help you with that.

Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.

Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
 2011-04-11 17:04:01 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters 
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
 2011-04-11 16:33:43 -07:00
Xavier Ducrohet
01ce57f92f am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp 
* commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56':
  Merge c5aeac7f from honeycomb.
 2011-04-11 16:33:12 -07:00
Gilles Debunne
e9f05b0079 Merge "Fix in BreakIterator." 2011-04-11 16:21:38 -07:00
Xavier Ducrohet
fc1bf92563 resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp 
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
 2011-04-11 16:15:54 -07:00
Eric Fischer
f60cee57f5 Merge "Import revised translations." 2011-04-11 14:36:47 -07:00
Mike Lockwood
d08b2ad9bc am 9e13c7e5: am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak 
* commit '9e13c7e5d787252b2a88aace1115b51a95e16b5d':
  UsbManager: minor Javadoc tweak
 2011-04-11 14:28:34 -07:00
Jason parks
3ef8b7463c am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit 'f953d3e2eac2af121e4b83f6bf613e0800fd7952':
  Implement teardown script.
 2011-04-11 14:28:30 -07:00
Jeff Hamilton
40c266ef48 am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit 'a83bc160892078c20489897190ee163d5c4d3783':
  Make the NFC UID forward compatible.
 2011-04-11 14:28:27 -07:00
James Dong
31557206d9 am 6f2b5d61: (-s ours) am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 
* commit '6f2b5d614c13fb93f20697bce3bf73176828276d':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
 2011-04-11 14:28:24 -07:00
Eric Fischer
64eecc0755 Import revised translations. 
Change-Id: Ib8940867bc7a807284dbb1297b5856e352690850
 2011-04-11 14:25:44 -07:00
Mike Lockwood
9e13c7e5d7 am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak 
* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
  UsbManager: minor Javadoc tweak
 2011-04-11 14:24:11 -07:00
Jason parks
f953d3e2ea am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
  Implement teardown script.
 2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089 am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
 2011-04-11 14:23:59 -07:00
James Dong
6f2b5d614c am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 
* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
 2011-04-11 14:23:52 -07:00
Jeff Brown
ec7b4b7a8c Merge "Add a sprite controller." 2011-04-11 14:10:56 -07:00
Jeff Brown
5541de9ea3 Add a sprite controller. 
Refactored PointerController to extract the surface management
code to a new component called a SpriteController so that it can
be used to move finger tracking spots around the screen as well.
The SpriteController is designed to fully decouple the client from
any latency introduced by surface transactions and drawing.
All sprite updates are performed asynchronously on the Looper using
a copy of the sprite state.

Added a stub SpotController implementation for touch pad UX.
It will be implemented in a subsequent patch.

Fixed a little bug in pointer orientation changes when entering
DISPLAY_ORIENTATION_90 the x offset was clobbered.

Change-Id: Ib25d162d577c9b354cb74d5d761c3c9f9f438d42
 2011-04-11 14:08:29 -07:00
Glenn Kasten
4123211637 am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) 
* commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d':
  Enable HDCP debugging in Stagefright (1 of 2)
 2011-04-11 12:49:03 -07:00
Glenn Kasten
a7e8385cb3 am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) 
* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
  Enable HDCP debugging in Stagefright (1 of 2)
 2011-04-11 12:46:38 -07:00
Glenn Kasten
87ee132ac5 am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) 
* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
  Enable HDCP debugging in Stagefright (1 of 2)
 2011-04-11 12:43:28 -07:00
Amith Yamasani
beb182a494 Merge "Package manager changes to store and update user information." 2011-04-11 12:14:17 -07:00
Amith Yamasani
4b2e934928 Package manager changes to store and update user information. 
Some API stubs for managing users and storing their details.
List of users is stored in an xml file.
Each user's properties are stored in a separate xml file.

Some unit tests for modifying the XML files.

Change-Id: If2ce2420723111bd426f6762def3c2afc19a0ae5
 2011-04-11 12:12:58 -07:00
Wink Saville
37e344cbe2 am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:11:14 -07:00
Wink Saville
1b00dc66d4 am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:08:19 -07:00
Wink Saville
3156a8c169 Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab Move ProcessedMessage into HierarchicalStateMachine. 
ProcessedMessage is really private to HSM and so moving
it into the HSM class.

Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
 2011-04-11 11:51:28 -07:00
Freeman Ng
8e0cc73919 am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 
* commit '2df36fd6ec39e096327032283d058b48be19e843':
  Add prepaid data services URL to Secure Settings
 2011-04-11 11:30:21 -07:00
Freeman Ng
2df36fd6ec am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
  Add prepaid data services URL to Secure Settings
 2011-04-11 11:19:18 -07:00
Freeman Ng
b7e8a54d98 Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 2011-04-11 11:10:18 -07:00
Glenn Kasten
c6c2285b36 Enable HDCP debugging in Stagefright (1 of 2) 
Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
 2011-04-11 11:07:53 -07:00
Andreas Huber
87312e9a81 If the media extractor specifies an invalid thumbnail time, default to the first frame. 
Change-Id: I96514fa661d26726b4562872a5ebe87be88db71e
related-to-bug: 3447147
 2011-04-11 10:57:29 -07:00
Jason Simmons
6eb3c59cfe Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams." 2011-04-11 10:43:41 -07:00
Wink Saville
a58ee55f49 am 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 
* commit '6e797566650c10ba8655aea914d521f5999073e8':
  Cleanup all functions overridden from DCT in GDCT
 2011-04-09 08:05:31 -07:00
Wink Saville
6e79756665 am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 
* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
  Cleanup all functions overridden from DCT in GDCT
 2011-04-09 07:57:35 -07:00
Wink Saville
442b08bc7c Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 2011-04-09 07:50:37 -07:00
Elliott Hughes
7797e647fc Merge "Tidy up exception throwing in the media native code." 2011-04-08 18:37:01 -07:00
Dianne Hackborn
bcbab36843 Merge "Rework thumbnails in activity manager." 2011-04-08 18:28:14 -07:00
Dianne Hackborn
f26fd99a7c Rework thumbnails in activity manager. 
We now only keep a thumbnail for the task, not for each
activity.  However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
we will make a new secondary thumbnail for that series of
activities.  There is a new API for the app to get these
secondary thumbnails.

Also set a default thumbnail size for non-xlarge screens
so we have thumbnails on phones.  (We need some smarter
code in the platform for computing the actual thumbnail
dimensions of the current device).  And add a test app
to show recent tasks + thumbnails.

Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
 2011-04-08 18:16:21 -07:00