100002 Commits

Author SHA1 Message Date
Katie McCormick
d68c096476 am 89e7aa3d: am 2306f0ee: am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '89e7aa3dae133fd38007eddb47a3e372abb68d4d':
  Doc change: Scroller Javadoc Bug # 7966653
2013-02-07 17:29:18 -08:00
Jesse Hall
fd1c028e34 Merge "Handle hotplug events as described instead of rescanning" 2013-02-08 01:29:03 +00:00
Katie McCormick
89e7aa3dae am 2306f0ee: am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '2306f0ee3396cd8a85d04dfbc08fb8c5ffa6699f':
  Doc change: Scroller Javadoc Bug # 7966653
2013-02-07 17:26:13 -08:00
Katie McCormick
2306f0ee33 am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit 'ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
  Doc change: Scroller Javadoc Bug # 7966653
2013-02-07 17:23:00 -08:00
Katie McCormick
ee27bcda86 am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit 'b68702eb0526633e51d9dbfe6fc971c168e1274a':
  Doc change: Scroller Javadoc Bug # 7966653
2013-02-07 17:21:29 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
2013-02-07 17:18:48 -08:00
Katie McCormick
0e66f16abd Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 2013-02-08 01:14:47 +00:00
Wink Saville
17cccb8ccb Merge "Move a few files from frameworks/opt/telephony to frameworks/base." 2013-02-08 01:06:10 +00:00
Wink Saville
5a72553ef9 Move a few files from frameworks/opt/telephony to frameworks/base.
Because ISms.aidl imports PendingIntent we couldn't easily
make opt/telephony part of the PDK. So this change moves
ISms.aidl and SmsRawData.*, which ISms.aidl also imports,
back to frameworks/base.

Change-Id: Ia64c6e771d5a292d9bfebb413a43f3745df55c85
2013-02-07 17:03:05 -08:00
Baligh Uddin
5ef8f22d71 Merge "Import translations. DO NOT MERGE" 2013-02-08 00:55:44 +00:00
Baligh Uddin
4d429e302a Merge "Import translations. DO NOT MERGE" 2013-02-08 00:45:05 +00:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
2013-02-07 16:42:26 -08:00
Katie McCormick
aff494005b am 1309c9e2: am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up
# Via Android Git Automerger (4) and Katie McCormick (1)
* commit '1309c9e2afe79ccd73cbf76f52477ffba92d10bd':
  Doc update: clean up
2013-02-07 15:59:35 -08:00
Katie McCormick
1309c9e2af am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up
# Via Android Git Automerger (3) and Katie McCormick (1)
* commit '93ebe2845c7f2d7afea1b679020446adcd0047ee':
  Doc update: clean up
2013-02-07 15:57:21 -08:00
Katie McCormick
93ebe2845c am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up
# Via Android Git Automerger (2) and Katie McCormick (1)
* commit '80a01a7f1d30ea5540eb8827dd221623f46e5a80':
  Doc update: clean up
2013-02-07 15:54:33 -08:00
Katie McCormick
80a01a7f1d am ef4196d0: am 89fafaea: Doc update: clean up
# Via Android Git Automerger (1) and Katie McCormick (1)
* commit 'ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98':
  Doc update: clean up
2013-02-07 15:52:32 -08:00
Katie McCormick
ef4196d0ec am 89fafaea: Doc update: clean up
# Via Katie McCormick
* commit '89fafaeae73cc265f13775944ccb2841bbc6766c':
  Doc update: clean up
2013-02-07 15:49:36 -08:00
Romain Guy
b4c1dc1c15 Merge "Don't clip when drawing a layer" 2013-02-07 23:32:42 +00:00
Tim Murray
eb8c29cb7e Add API entry points for clipped kernels.
Change-Id: Idf474a5ac391c41e9215cd2f03e7f8c4bfb875fa
2013-02-07 15:22:36 -08:00
Romain Guy
63696bfc05 Don't clip when drawing a layer
A layer will, by definition, clip its content already. The extra
clip added by the UI toolkit/renderer is wasteful and in some
situations very expensive. If a layered view is rotated, the clip
will be transformed into a non-rectangular region, thus forcing
the renderer to rely on the stencil buffer. The whole point of
using layers is to draw efficiently so let's avoid this case.

Change-Id: I813465f6468cc386b84a4d058c11a258fef8507a
2013-02-07 15:20:55 -08:00
Jeff Sharkey
36b8d38e20 Merge "Use safe buffer sizes when parsing network stats." 2013-02-07 23:03:55 +00:00
Jeff Sharkey
8669a16694 Use safe buffer sizes when parsing network stats.
Change-Id: I1733c1ddc48f9410136aee7af7889fdc7be8cc10
2013-02-07 15:02:55 -08:00
Chris Craik
ccac8c9557 Merge "Correctly resume profileRendering" 2013-02-07 22:53:44 +00:00
Jeff Sharkey
8500f92a53 Merge "Improve TrafficStats UID APIs." 2013-02-07 22:27:55 +00:00
The Android Automerger
0474ed4e0c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-07 14:23:30 -08:00
Katie McCormick
89fafaeae7 Doc update: clean up
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
2013-02-07 14:23:14 -08:00
Alon Albert
92afa5aa3e Merge "COnvert sync error to int" 2013-02-07 22:05:08 +00:00
Jesse Hall
62af9551c9 Process all display events in order
Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.

Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.

Bug: 7491120
Change-Id: I448d139d21dc27128d75ca1d661de666fff51bcb
2013-02-07 22:01:19 +00:00
Jesse Hall
190fd9aeca Handle hotplug events as described instead of rescanning
Hotplug events say which display they're for and whether the display
was connected or disconnected. Before, this info was ignored, and the
event just triggered a rescan of all displays. If a display was
disconnected and then reconnected quickly, the rescan would treat this
as a no-op or a device property change and wouldn't turn the display
on.

Now the display manager attempts to update its state with the change
the event describes. So a quick disconnect/connect cycle will cause
the display to be turned on since the display manager will have
updated its internal state to reflect the disconnect event, and will
treat the connect event as a new display rather than a device property
change.

Bug: 7491120
Change-Id: Ia83f7c96b7f16f4c1bed2a73e9b56b0bf7ee3984
2013-02-07 21:59:41 +00:00
Jeff Sharkey
92be93a94e Improve TrafficStats UID APIs.
Deprecate transport layer statistics, leaving only the summarized
network layer statistics.

Improve documentation to be clear about layers where measurements
occur, and their behavior since boot.  Under the hood, move to using
xt_qtaguid UID statistics.

Bug: 6818637, 7013662
Change-Id: I9f26992e5fcdebd88c671e5765bd91229e7b0016
2013-02-07 13:59:26 -08:00
Chris Craik
ae4f3204ec Correctly resume profileRendering
Ensure profileRendering reschedules a previously created profiler callback if
disabled and reenabled

Change-Id: I181ac5043966b99bb8d21e69ce4fdd7494102acb
2013-02-07 12:57:10 -08:00
Daniel Sandler
fde19b106b New API to request a list of current notifications.
The ACCESS_NOTIFICATIONS permission is signature|system only.

Change-Id: I41338230aee9611117cbdac251c1b6b6c3cebf00
2013-02-07 15:43:02 -05:00
Alan Viverette
b428b0fc5b Delay accessibility announcements in the keyguard.
Prevents interruption of announcements when magnification is enabled.

Bug: 7895569
Change-Id: I87ae1ee41ade2b59a0f1da8046c5bd23d0637da2
2013-02-07 12:19:15 -08:00
Romain Guy
da8d8b9699 Merge "Add a RenderBuffer object to store stencil buffers. Bug #7146141" 2013-02-07 20:11:56 +00:00
Romain Guy
3bbacf27c0 Add a RenderBuffer object to store stencil buffers.
Bug #7146141

This change is needed to add a render buffer cache to avoid
creating and destroying stencil buffers on every frame.

This change also allows the renderer to use a 1 bit or 4 bit
stencil buffer whenever possible.

Finally this change fixes a bug introduced by a previous CL
which causes the stencil buffer to not be updated in certain
conditions. The fix relies on a new optional parameter in
drawColorRects() that can be used to avoid performing a
quickReject on rectangles generated by the clip region.

Change-Id: I2f55a8e807009887b276a83cde9f53fd5c01199f
2013-02-07 12:11:22 -08:00
Alon Albert
5c113faba6 COnvert sync error to int
Bug: 8152259
Change-Id: I99fc99f70796c70ec0566c40ba350e10c36b90b7
2013-02-07 12:01:10 -08:00
Alon Albert
2c45e91373 Merge "Add Calendar Color Index to CalendarEntity" 2013-02-07 19:55:09 +00:00
Alon Albert
0114112203 Add Calendar Color Index to CalendarEntity
Change-Id: I8dac2628fce44e37e5df1e19a97fc29934a6ba79
2013-02-07 11:50:27 -08:00
Jaikumar Ganesh
e11f058ee0 am d080bb07: am b9620a89: am 9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Android Git Automerger (2) and others
* commit 'd080bb07c88ca5ccf99f326789ed472448b50832':
  Services: Adding HSPAP info in Android
2013-02-07 11:19:59 -08:00
Robert Ly
5f9922d7c3 makefile changes for gcm javadocs
Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2
2013-02-07 11:08:44 -08:00
Robert Greenwalt
034170cd4c Merge "Second pass tying into dns cache per interface" 2013-02-07 19:02:47 +00:00
Jaikumar Ganesh
d080bb07c8 am b9620a89: am 9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Android Git Automerger (1) and others
* commit 'b9620a89bd734d749cd162cbcda4699474bbf57a':
  Services: Adding HSPAP info in Android
2013-02-07 10:57:40 -08:00
Craig Mautner
2ceb081505 Merge "Migrate AppWindowToken lists into DisplayContent." 2013-02-07 18:50:52 +00:00
Jaikumar Ganesh
b9620a89bd am 9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '9434c112d1fef52ade78d7ef818daf981bf63bef':
  Services: Adding HSPAP info in Android
2013-02-07 10:46:10 -08:00
Jaikumar Ganesh
9434c112d1 Merge "Services: Adding HSPAP info in Android" 2013-02-07 17:54:41 +00:00
Dianne Hackborn
64d41d7391 Fix build, conflict with another change.
Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f
2013-02-07 00:33:31 -08:00
Dianne Hackborn
34e0b05e28 Merge "App ops: track system windows, monitoring changes." 2013-02-07 08:03:14 +00:00
Dianne Hackborn
c2293025a2 App ops: track system windows, monitoring changes.
Change-Id: I273e82bdad66ada3bf0f7ec9176bc304b9ee1ee8
2013-02-06 23:59:56 -08:00
Daniel Sandler
8949b2480b am fb2b5e04: am 1fd77470: am 1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (2) and others
* commit 'fb2b5e04a02669c764e4ebd7a6daf9846d596435':
  DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
2013-02-06 22:06:23 -08:00
Jeffrey Brown
e24c67e322 am 2990ed7a: am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (2) and others
* commit '2990ed7a3bf7314bbd4d98161fbcdcf48098052c':
  NullPointerException in SQLiteSession
2013-02-06 22:06:18 -08:00