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

50449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
3cd61e2bca am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1 
* commit '084d3490a5283088426058d3c15532b176367926':
  docs: update homepage I/O announcement
 2011-05-13 20:32:32 -07:00
Scott Main
084d3490a5 am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1 
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
  docs: update homepage I/O announcement
 2011-05-13 20:29:45 -07:00
Scott Main
f73dcad35d Merge "docs: update homepage I/O announcement" into honeycomb-mr1 2011-05-13 20:26:56 -07:00
Fabrice Di Meglio
8fb507171f Fix bug #4415576 Gmail text looks broken 
- pass correct "contextCount" when needed

Change-Id: I56ebd9486e99e6ca5a3973ec403cf1ced874b4c3
 2011-05-13 18:58:59 -07:00
Jeff Sharkey
262c177b1b Merge "Add Socket tagging for granular data accounting." 2011-05-13 18:51:36 -07:00
Dianne Hackborn
510f9eb242 am 24df0757: (-s ours) am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit '24df0757f86851569b65dadd0dfa139521748b9c':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:43:14 -07:00
Dianne Hackborn
24df0757f8 am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:41:04 -07:00
Dianne Hackborn
ed9321ab5d am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:39:01 -07:00
Dianne Hackborn
9a84983a9f DO NOT MERGE. Integrate from master: Improve activity manager debug dumps. 
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
 2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3 DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
And clean up some documentation.

Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
 2011-05-13 18:31:04 -07:00
Jeff Sharkey
43be174888 Add Socket tagging for granular data accounting. 
Introduces public API to apply "tags" to track data traffic originating
from the current thread.  (Under the hood, the tags are maintained and
applied in BlockGuard.)  Also adds tag/untag methods for developers who
maintain their own Socket pools.

Change-Id: Ic2dd3155559a93a7b613c7853748d4c44fb3a39e
 2011-05-13 18:19:00 -07:00
Xavier Ducrohet
8c2f85d941 am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit 'd00541603fbbb4e38264e75a2b6abf8705efeb49':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:43:37 -07:00
Xavier Ducrohet
d00541603f am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:36:16 -07:00
Xavier Ducrohet
6d040a7f20 am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit '738c5e6072459c772064c96233cf59639bbfe2fd':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:32:47 -07:00
Dianne Hackborn
ba4990c77c am 71da3207: am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 
* commit '71da32074ce729fe170de2d6c348b110fb6625cc':
  Fix a bug where an action bar could be created when it should not be.
 2011-05-13 16:32:00 -07:00
James Dong
bfb6791934 Merge "Add support for platform-specific recording start time offset" 2011-05-13 16:31:10 -07:00
Xavier Ducrohet
738c5e6072 am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:30:44 -07:00
James Dong
bf9f408b59 Merge "Support for storing geo information in the recorded mp4/3gpp file." 2011-05-13 16:30:16 -07:00
Dianne Hackborn
71da32074c am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 
* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
  Fix a bug where an action bar could be created when it should not be.
 2011-05-13 16:29:40 -07:00
James Dong
987ab4833e Support for storing geo information in the recorded mp4/3gpp file. 
o Geo data (latitude and longitude) is stored in udta box

Change-Id: I76e4aeb741c4b339f3753d3d28190151f3ea4919
related-to-bug: 4260295
 2011-05-13 16:29:19 -07:00
Dianne Hackborn
7d87c37b03 am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
  Fix a bug where an action bar could be created when it should not be.
 2011-05-13 16:26:44 -07:00
Dianne Hackborn
6121f06ed5 Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 2011-05-13 16:24:32 -07:00
Eric Fischer
aa126171ae Fix the build by removing @Override within javadoc comments. 
Change-Id: I984cc6224185ab84e904bfc89eae80d567fcb59b
 2011-05-13 16:08:24 -07:00
Xavier Ducrohet
2fae858db5 LayoutLib: implement data binding for most AdapterView 
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
 2011-05-13 15:55:49 -07:00
Dianne Hackborn
e4c536049c am 28a8bce6: (-s ours) am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit '28a8bce691358dca3872e65d3604f3b0ff3fccaf':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:48:02 -07:00
Dianne Hackborn
28a8bce691 am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:45:23 -07:00
Christopher Tate
42d7c9c061 Merge "Full backup tweaks" 2011-05-13 15:41:32 -07:00
Christopher Tate
dc92c82b41 Full backup tweaks 
* provide placeholder UI showing backup/restore start/stop/timeout
* don't kill the progress UI in mid stream
* tidy up the pax extended header data writing a little

Change-Id: Ife0cb78e3facb541d8327f1d5ca5fe77faa6cbca
 2011-05-13 15:38:02 -07:00
Dianne Hackborn
6824c135fe am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:36:48 -07:00
Dianne Hackborn
f3f2d731e1 Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 2011-05-13 15:33:21 -07:00
Jeff Brown
ae7bc6529a am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945 
* commit '0d9288d7848e144fdf7afbd7284254dae3d13d43':
  Fix bounds check. Bug: 4413945
 2011-05-13 15:22:35 -07:00
Dianne Hackborn
dce3e2e120 am 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 
* commit '2e4a3236a7634d17f89288e9739a438ecbea0471':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
 2011-05-13 15:22:30 -07:00
Scott Main
853cfd4f41 am 15f8a6a7: am 4c53fc7e: am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 
* commit '15f8a6a726658bfb195924bd5d7bb86684a22de0':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
 2011-05-13 15:22:27 -07:00
Scott Main
7eeea01b66 am f5c82622: am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806 
* commit 'f5c826224b0c6b9edf1a892a6ffc6273401e6e27':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
 2011-05-13 15:22:12 -07:00
Wink Saville
ce29ea93f6 Merge "resolved conflicts for merge of 74af525e to master" 2011-05-13 15:10:08 -07:00
Romain Guy
8bd6d36c68 Merge "Remove useless code." 2011-05-13 14:50:06 -07:00
Romain Guy
4c8ed71cc7 Remove useless code. 
Change-Id: Ic2418438235e1fbcb8ccfece9c74c54fc46229df
 2011-05-13 14:48:28 -07:00
James Dong
d295296a96 Track id really starts with 1, not 0 
Change-Id: I55dcfdc2dc2a64285dfa93024f7b885210cc827e
 2011-05-13 14:41:21 -07:00
Svetoslav Ganov
73162196e7 Merge "Factored out the Accessibility vertical initialization." 2011-05-13 14:19:17 -07:00
Svetoslav Ganov
30401328c1 Factored out the Accessibility vertical initialization. 
1. Accessibility events were filled with data in
   dispatchPopulateAccessibilityEvent and
   onPopulateAccessibilityEvent. These events have
   two axis of population 1) up the class
   hierarchy to populate information for the event
   source; 2) down the view hierarchy to populated
   all the text contained in the source including
   its descendants. These two axis of population
   were done in on population pass now the populating
   the source properties happens in initializeAccessiblityEvent
   and the text in onPopulateAccessibilityEvent which
   is called from dispatchPopulateAccessiblityEvent.

2. Removed the string description from events fired from
   CompoundButton since the event has isChecked()
   property and it is responsibility of the clients
   to decide what utterrance to use and if to use such
   for announcing the checked state.

Change-Id: I5d7f75cf8a87a7a4b3bb7b311e8e642ec9a0faa5
 2011-05-13 14:18:37 -07:00
Adam Powell
a593d9852f Fix a bug where an action bar could be created when it should not be. 
Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
 2011-05-13 14:09:54 -07:00
Gloria Wang
7d33460216 Merge "Add one more DRM error code. For bug 4422428." 2011-05-13 14:02:50 -07:00
Wink Saville
5a84de6ee6 resolved conflicts for merge of 74af525e to master 
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
 2011-05-13 14:01:16 -07:00
Gloria Wang
eea8c02bc8 Add one more DRM error code. For bug 4422428. 
Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6
 2011-05-13 13:53:15 -07:00
Jeff Brown
0d9288d784 am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945 
* commit '2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
  Fix bounds check. Bug: 4413945
 2011-05-13 13:07:44 -07:00
Jeff Brown
2bdb756cdf am 4fb76253: Fix bounds check. Bug: 4413945 
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
  Fix bounds check. Bug: 4413945
 2011-05-13 13:04:28 -07:00
Jeff Brown
4fb76253f2 Fix bounds check. 
Bug: 4413945

Also remove dead code from header file.

Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
 2011-05-13 12:51:12 -07:00
Dianne Hackborn
16f6e89c2a DO NOT MERGE. Integrate fragment work from master 
Back-port new fragment detach APIs from support lib.

This allow a much cleaner implementation of things like the
fragment pager class.

Integrate from support lib: fix restore of list state.

The FragmentManager/ListFragment impl was restoring the list
state before setting its adapter.  This caused the list view to
lose the state, since it gets cleared as part of setting the
adapter.  Now the fragment manager waits on restoring the view
hierarchy state until after it has done onActivityCreated(),
at which point we have set the adapter.

It would be nice to make list view less fragile in this regard,
but that is for a different change.

Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
 2011-05-13 12:42:22 -07:00
Justin Ho
89fd07f772 Cleaning up notification panel drawables 
Change-Id: I7f89388a0a4d663e055b8012ec9a58593707f4a5
 2011-05-13 12:26:06 -07:00
Jeff Brown
65f47d8810 Merge "Add initial API for stylus and mouse buttons." 2011-05-13 12:14:27 -07:00