Commit Graph

32039 Commits

Author SHA1 Message Date
Ian Rogers
023c1f4a1e am 896ee5b6: am be4536d2: Merge "Adding matching @deprecated."
* commit '896ee5b6f8354567464a371025088156ed49bc32':
  Adding matching @deprecated.
2013-04-23 15:01:30 -07:00
Chet Haase
7aea41b3d6 am 393abb1c: am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
* commit '393abb1c54c6b847b81e2390efcd6ec95e8237f8':
  Expand invalidation rectangle when clipChildren == false
2013-04-23 11:16:25 -07:00
Daniel Sandler
bf7b95cec9 am 2fd0ba8e: am f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
* commit '2fd0ba8e9529780fd87b71a024edb3200ad1d93a':
  Fix concurrency issues when parceling StatusBarNotifications.
2013-04-23 11:16:19 -07:00
Nick Pelly
dfe49e9c9f am 09e9e1a5: am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
* commit '09e9e1a5e7e3dd161b73f4254f239cab0410438a':
  Add ContentValues & CursorWindow to framework.aidl
2013-04-23 11:16:11 -07:00
Michael Wright
058feb4e1d am 58500051: am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
* commit '585000515faacc02736f920425ae6c323223ee58':
  Rewrite input handling for native applications
2013-04-23 11:16:08 -07:00
Svetoslav
7ac47e8acb am 7bf02d12: am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit '7bf02d1255e86becb225ba70ca3ea8b2af90c166':
  Making new node id APIs return strings.
2013-04-23 11:16:05 -07:00
Dianne Hackborn
eadbcd3352 resolved conflicts for merge of 8c3cb811 to master
Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
2013-04-23 10:56:23 -07:00
Ian Rogers
896ee5b6f8 am be4536d2: Merge "Adding matching @deprecated."
* commit 'be4536d214eedc3d12b50f0f30b47bba773b8dbc':
  Adding matching @deprecated.
2013-04-23 09:15:58 -07:00
Ian Rogers
be4536d214 Merge "Adding matching @deprecated." 2013-04-23 15:13:05 +00:00
Philip Milne
e11d9ed3ec am 089a75be: am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '089a75be5e33e13071754a727902224b6db60168':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
2013-04-23 04:46:31 -07:00
Robert Greenwalt
75a1cac2bf am f12afa99: am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit 'f12afa9913ac75af724d9700ff85dc68b1e0cd45':
  Listen for network disconnect.
2013-04-23 04:46:25 -07:00
Chet Haase
393abb1c54 am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
* commit '5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9':
  Expand invalidation rectangle when clipChildren == false
2013-04-23 03:52:28 -07:00
Daniel Sandler
2fd0ba8e95 am f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
* commit 'f78ff07f6e688d11881658f743ef63076fcc550c':
  Fix concurrency issues when parceling StatusBarNotifications.
2013-04-23 03:52:06 -07:00
Nick Pelly
09e9e1a5e7 am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
* commit 'edced26f162b0232338064e569fe651b8c805f93':
  Add ContentValues & CursorWindow to framework.aidl
2013-04-23 03:51:56 -07:00
Michael Wright
585000515f am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
* commit '5fe6e4c4c9de523fa9e74902473996ce5ee8b298':
  Rewrite input handling for native applications
2013-04-23 03:51:53 -07:00
Svetoslav
7bf02d1255 am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit 'a61464d7adc26c291a5f9de48c9aff8b76a56b1f':
  Making new node id APIs return strings.
2013-04-23 03:51:50 -07:00
Dianne Hackborn
8c3cb8111a am a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev
* commit 'a4629b0b833f78481ca51baa44b0303ebe647a7c':
  JB MR2 == API 18.
2013-04-23 03:51:40 -07:00
Philip Milne
089a75be5e am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit 'a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
2013-04-23 03:51:29 -07:00
Robert Greenwalt
f12afa9913 am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit 'd020294572f591007de1fe0aa9e4927dae72c0c9':
  Listen for network disconnect.
2013-04-23 03:51:08 -07:00
Chet Haase
5e650cef53 Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev 2013-04-23 02:50:54 +00:00
Daniel Sandler
f78ff07f6e Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev 2013-04-23 00:53:31 +00:00
Nick Pelly
edced26f16 Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev 2013-04-23 00:07:19 +00:00
Michael Wright
5fe6e4c4c9 Merge "Rewrite input handling for native applications" into jb-mr2-dev 2013-04-23 00:04:44 +00:00
Michael Wright
a44dd26a75 Rewrite input handling for native applications
Bug: 8473020
Change-Id: Ic4353d8924ab877bec21aff8c2dba9fe725bf906
2013-04-22 17:01:51 -07:00
Svetoslav
a61464d7ad Merge "Making new node id APIs return strings." into jb-mr2-dev 2013-04-23 00:01:36 +00:00
Dianne Hackborn
a4629b0b83 Merge "JB MR2 == API 18." into jb-mr2-dev 2013-04-22 23:37:37 +00:00
Nick Pelly
bb392ba5f7 Add ContentValues & CursorWindow to framework.aidl
By adding these stubs, they will be automatically added to framework.aidl
in sdk builds.

This makes it easier for unbundled apps to pass these objects across
AIDL calls.

ContentValues & CursorWindow are already public Parcelables. It is an
oversight that they were not already in framework.aidl.

There are a lot of other public Parcelables that are missing from
framework.aidl. This just fixes two commonly requested ones.

Change-Id: If61e19b1206da1680413d9ea03de87a90b6d233e
2013-04-23 08:30:34 +10:00
Philip Milne
a7b2625d43 Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev 2013-04-22 22:26:21 +00:00
Robert Greenwalt
d020294572 Merge "Listen for network disconnect." into jb-mr2-dev 2013-04-22 21:33:29 +00:00
Robert Greenwalt
1b0ca9dace Listen for network disconnect.
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
2013-04-22 14:13:51 -07:00
Dianne Hackborn
d2eeed635d JB MR2 == API 18.
Change-Id: Ia62a81f8ebc79ae0e01b181f4ef47ef192c71592
2013-04-22 13:28:47 -07:00
Philip Milne
ca2e9e1122 Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
GridLayout is working as intended here. The bug is appears to be in RelativeLayout
(and possibly LinearLayout).

The value of RelativeLayout.DEFAULT_WIDTH = Integer.MAX_VALUE/2 is 0x3FFFFFFF has bits
set in the range that is used to flag certain conditions and states by the layout system.

In View we have:

MEASURED_SIZE_MASK = 0x00ffffff
MEASURED_STATE_MASK = 0xff000000;
MEASURED_STATE_TOO_SMALL = 0x01000000

This change fixes this bug, though it looks as if that a safer solution would be to not introduce
this constant and code path in the first place - as RelativeLayout's measurement algorithm operates
in the LTR case without it.

Change-Id: I01c51ae854620f08dd63047594486a3464c86f3a
2013-04-22 12:58:55 -07:00
Svetoslav
9fa1ee563b Making new node id APIs return strings.
The node id does not have to be decorated with spans like spannable
so it makes no sense to have these APIs use anything else but string.

bug:8657338

Change-Id: I2e7c31128ee9f2933bd0d58beac4ba31a498bb09
2013-04-22 12:43:07 -07:00
Daniel Sandler
1a497d3a2b Fix concurrency issues when parceling StatusBarNotifications.
Protip: Don't mess with Bundles after you've sent them off
for parceling in an RPC.

Note that this change reduces the payload size of
StatusBarNotification objects received in
onNotificationRemoved() callbacks; it scrubs out the
RemoteViews and Bitmaps just as the NoMan's internal archive
does. [You don't really need that information anyway when
hearing about a removed notification; most likely all you
need are the other slots on StatusBarNotification, but
nulling the whole Notification object breaks a lot of
clients.]

Bug: 8616295
Change-Id: Ic899045f2352b96dcf064d3e9e51dad52629aea3
2013-04-22 15:14:55 -04:00
Chet Haase
a4f14ebe29 Expand invalidation rectangle when clipChildren == false
The current invalidation logic does not take into account the clipChildren
flag. When this flag is set to false on a container (an uncommon but
possible case), it is possible for views in the child hierarchy of
the container to be draw outside of the container's bounds. But invalidations
on that view hiearrchy can be clipped to the container's bounds, causing us to
not redraw views outside of those bounds.

Fix is to expand the dirty rect of an invalidation to encompass the complete
bounds of any container with clipChildren==false.

Issue #680037 Some transform combinations can leave old pixel values on the screen

Change-Id: I426beee15d04145fac2f6b4203748ae309e392b4
2013-04-22 11:11:39 -07:00
Michael Wright
323efd55d3 am 076e1f4c: am abc2763e: Merge "KeyEvent: update comment"
* commit '076e1f4c560df7db54755b006acbea9b6eba0b76':
  KeyEvent: update comment
2013-04-20 22:48:08 -07:00
Michael Wright
076e1f4c56 am abc2763e: Merge "KeyEvent: update comment"
* commit 'abc2763e4587c3326d160f25666e933cc6888884':
  KeyEvent: update comment
2013-04-20 22:43:56 -07:00
Michael Wright
abc2763e45 Merge "KeyEvent: update comment" 2013-04-21 05:34:28 +00:00
Chet Haase
684634144b am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
  Fix quickReject logic to account for setClipChildren() setting
2013-04-20 21:37:23 -07:00
Selim Gurun
e8cb9e55b8 am 20113c0b: am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
* commit '20113c0b4dc6f5d6bebaf3175bfc99ce89cc2388':
  Revert "Add a delimiter between scheme and host"
2013-04-20 21:37:15 -07:00
Fabrice Di Meglio
16cea16570 am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
* commit 'b241f60fe76677d106d472d4118d1e6959563331':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-20 21:37:04 -07:00
Christopher Tate
114f85dcb7 am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
* commit '353bd75bbab5904cc872364586acf7eb05b4e264':
  Provide SharedPreferences coherence guarantees for BackupAgent
2013-04-20 21:36:57 -07:00
Victoria Lease
a5d3459316 am 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
* commit '7e170b632147da55f93864223419a9f7fa651410':
  do not attempt to parcel unknown ParcelableSpans
2013-04-20 21:36:55 -07:00
Dianne Hackborn
4c2b007b5e am 5b00f558: am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit '5b00f5584a7894bb79f9ce369d88cea5d886ff22':
  Follow up on issue #8159072: Spinner widget should be RTL'ized
2013-04-20 21:36:51 -07:00
Chet Haase
371d4cccde am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
* commit '339ac85483145972da010ad34cbcb29ed70cb822':
  Fix quickReject logic to account for setClipChildren() setting
2013-04-20 21:34:59 -07:00
Selim Gurun
20113c0b4d am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
* commit '940718d8598e4b8da3009b46e8edba9d1dc6ed40':
  Revert "Add a delimiter between scheme and host"
2013-04-20 21:34:55 -07:00
Fabrice Di Meglio
b241f60fe7 am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
* commit 'c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-20 21:34:53 -07:00
Christopher Tate
353bd75bba am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
* commit '18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
  Provide SharedPreferences coherence guarantees for BackupAgent
2013-04-20 21:34:52 -07:00
Victoria Lease
7e170b6321 am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
* commit 'bcf3ec96a46aacba58af62ed963ebf1c812c8179':
  do not attempt to parcel unknown ParcelableSpans
2013-04-20 21:34:52 -07:00
Dianne Hackborn
5b00f5584a am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev
* commit 'b3bffa8080c4b04285897d18f913cf6385b0e9e1':
  Follow up on issue #8159072: Spinner widget should be RTL'ized
2013-04-20 21:34:51 -07:00