21755 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Jeff Brown
65f47d8810 Merge "Add initial API for stylus and mouse buttons." 2011-05-13 12:14:27 -07:00
Jeff Brown
fe9f8ab03a Add initial API for stylus and mouse buttons.
Added the concept of pointer properties in a MotionEvent.
This is currently used to track the pointer tool type to enable
applications to distinguish finger touches from a stylus.

Button states are also reported to application as part of touch events.

There are no new actions for detecting changes in button states.
The application should instead query the button state from the
MotionEvent and take appropriate action as needed.

A good time to check the button state is on ACTION_DOWN.

As a side-effect, applications that do not support multiple buttons
will treat primary, secondary and tertiary buttons identically
for all touch events.

The back button on the mouse is mapped to KEYCODE_BACK
and the forward button is mapped to KEYCODE_FORWARD.

Added basic plumbing for the secondary mouse button to invoke
the context menu, particularly in lists.

Added clamp and split methods on MotionEvent to take care of
common filtering operations so we don't have them scattered
in multiple places across the framework.

Bug: 4260011
Change-Id: Ie992b4d4e00c8f2e76b961da0a902145b27f6d83
2011-05-13 12:11:17 -07:00
Dianne Hackborn
5684d6bc7e Merge "resolved conflicts for merge of ec85619f to master" 2011-05-13 12:06:45 -07:00
Romain Guy
3e8abfdf02 Merge "Fix waaayyy too many documentation links." 2011-05-13 11:50:06 -07:00
Romain Guy
5c22a8c80a Fix waaayyy too many documentation links.
Change-Id: Ia8d56149d8b92d85239ad62adacbf65d1e9e127d
2011-05-13 11:48:45 -07:00
Dianne Hackborn
2e4a3236a7 am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
2011-05-13 11:21:26 -07:00
Dianne Hackborn
46a282f323 am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
2011-05-13 11:18:40 -07:00
Fabrice Di Meglio
9dec462c1f Merge "Prepare OpenGLRenderer to use glyphs from TextLayoutCache" 2011-05-13 11:09:19 -07:00
Fabrice Di Meglio
2ea7588014 Prepare OpenGLRenderer to use glyphs from TextLayoutCache
- add OpenGLRenderer.drawGlyph()
- refactor glypth logging code

Change-Id: I797e6f1304d3f3f8f6ed31e7f9965d336233d2a4
2011-05-13 11:07:38 -07:00
Gilles Debunne
90eb1053c1 Merge "SuggestionSpans are preserved when picked." 2011-05-13 09:41:57 -07:00
Dianne Hackborn
ebff8f92f1 DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
Dianne Hackborn
39cf8c97c3 resolved conflicts for merge of ec85619f to master
Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa
2011-05-12 18:37:33 -07:00
Dianne Hackborn
c6c8ada163 am dda64e9a: am 51454295: am df9799f0: Fix build.
* commit 'dda64e9a4af2e7dbc75a3b2fc7c41b9d63848a59':
  Fix build.
2011-05-12 17:42:14 -07:00
Dianne Hackborn
ec85619f02 am d46849a5: am a8138732: MR2 is going to be API 13.
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
  MR2 is going to be API 13.
2011-05-12 17:39:30 -07:00
Dianne Hackborn
dda64e9a4a am 51454295: am df9799f0: Fix build.
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
  Fix build.
2011-05-12 17:39:22 -07:00
Dianne Hackborn
d46849a535 am a8138732: MR2 is going to be API 13.
* commit 'a8138732a01b92f0a40f72050b74a3bd4cf6d215':
  MR2 is going to be API 13.
2011-05-12 17:35:35 -07:00
Dianne Hackborn
51454295a5 am df9799f0: Fix build.
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
  Fix build.
2011-05-12 17:35:20 -07:00
Jean-Baptiste Queru
ce0ce2dde2 Merge from honeycomb-plus-aosp
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
2011-05-12 17:23:41 -07:00
Dianne Hackborn
88bf0e5ae7 Merge "resolved conflicts for merge of 0e59729b to master" 2011-05-12 17:15:22 -07:00
John Reck
c51ab9b93d Merge "Adding functions to query the state of a WebElement." 2011-05-12 17:00:38 -07:00
Chia-chi Yeh
a210ae5cef Merge "Add a method to create ParcelFileDescriptors from DatagramSockets." 2011-05-12 16:55:58 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13.
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
2011-05-12 16:26:47 -07:00
Chia-chi Yeh
47f8f0fa70 Add a method to create ParcelFileDescriptors from DatagramSockets.
Change-Id: I16dddb2395628657b140b53a1b2fee5f311b049a
2011-05-12 16:25:27 -07:00
Dima Zavin
f76dd3abbe Merge "update for new audio.h header location" 2011-05-12 16:06:20 -07:00
Jean-Baptiste Queru
b0ca8b9dfd am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
  Ninepatch tweaks for better interop
2011-05-12 15:52:16 -07:00
Dianne Hackborn
3d0724dc22 resolved conflicts for merge of 0e59729b to master
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
2011-05-12 15:39:41 -07:00
Jean-Baptiste Queru
a84d29cb04 am 6714e677: Merge "Ninepatch tweaks for better interop"
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
e8b669cbd7 am 71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
2011-05-12 15:38:07 -07:00
Gilles Debunne
ee511cc529 SuggestionSpans are preserved when picked.
This is the exception case: text replacement should NOT remove SuggestionSpans
when this is the result of a Suggestion pick in the popup.

Save them and restore them after the text replacement.
Only spans that entirely englobe the replaced region make sense after the
text replacement.

Change-Id: Ib18eb6437c3a63fd0e788ebd4565c8f42e83503b
2011-05-12 15:20:30 -07:00
Dianne Hackborn
df9799f0fc Fix build.
Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
2011-05-12 15:16:33 -07:00
Teng-Hui Zhu
858daa1fbb am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
2011-05-12 15:05:29 -07:00
Dianne Hackborn
0e59729b10 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence.
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
a0e661b4e4 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
2011-05-12 15:01:56 -07:00
Dianne Hackborn
972808164a am 0f1de9ad: New compat mode front end: UI and persistence.
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
2011-05-12 15:01:53 -07:00
Jean-Baptiste Queru
9faa34e603 Ninepatch tweaks for better interop
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
2011-05-12 14:22:43 -07:00
Irfan Sheriff
01ea7f01ec Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2 2011-05-12 14:18:03 -07:00