Craig Mautner
53078b25c9
Merge "Implement stack splitting and task movement."
2013-04-17 01:58:15 +00:00
Chris Craik
e76dd37bdb
am 680ca941: am ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev
...
* commit '680ca9418b6b3f01547b286d1a80e07e186bc05f':
Make layer double drawing visible in overdraw debug mode
2013-04-16 18:02:31 -07:00
Philip Milne
d05849e887
am a1ea8019: am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev
...
* commit 'a1ea801956c4727656ef25177b1bb4c5b788cde7':
Fix for bug 8272673: GridLayout in battery details is cut off.
2013-04-16 18:02:28 -07:00
Chris Craik
680ca9418b
am ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev
...
* commit 'ec5dc76a15081136fa57d10a231d1c5ac5901421':
Make layer double drawing visible in overdraw debug mode
2013-04-16 18:00:18 -07:00
Philip Milne
a1ea801956
am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev
...
* commit '61527436b7fd5d8dd42eaf8052c02816e6a13887':
Fix for bug 8272673: GridLayout in battery details is cut off.
2013-04-16 18:00:15 -07:00
Chris Craik
ec5dc76a15
Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev
2013-04-17 00:58:43 +00:00
Philip Milne
61527436b7
Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev
2013-04-17 00:56:55 +00:00
Ben Gruver
303d004ca0
am e920a298: am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
...
* commit 'e920a298f7ee7005b05a0d689e0aae5ca1b369e9':
Monitor the firewall rules file for changes
2013-04-16 17:51:04 -07:00
Ben Gruver
e920a298f7
am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
...
* commit '53f22ad9c30e03f4762737a722b2762dcf934523':
Monitor the firewall rules file for changes
2013-04-16 17:47:57 -07:00
Ben Gruver
53f22ad9c3
Merge "Monitor the firewall rules file for changes" into jb-mr2-dev
2013-04-17 00:44:56 +00:00
Jamie Gennis
a720a87fde
am a0b28ca7: am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev
...
* commit 'a0b28ca74806dcf46300d82ebb689b002bd36955':
Disable tracing from Zygote
2013-04-16 17:01:12 -07:00
Dmitry Shmidt
92dc450782
Merge "softap: Set broadcast option explicitly"
2013-04-16 23:59:50 +00:00
Jamie Gennis
a0b28ca748
am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev
...
* commit '95a869f91bb9ab24300cec37037b0edcfa54f334':
Disable tracing from Zygote
2013-04-16 16:59:07 -07:00
Doug Zongker
057d3eb1bd
Merge "RecoverySystem: update comment to reflect signature changes"
2013-04-16 23:56:28 +00:00
Jamie Gennis
95a869f91b
Merge "Disable tracing from Zygote" into jb-mr2-dev
2013-04-16 23:55:33 +00:00
Philip Milne
e0b85cd706
Fix for bug 8272673: GridLayout in battery details is cut off.
...
Change-Id: Iabcc2d2c486162cf88990eb1a25aca2e7558a57c
2013-04-16 16:33:44 -07:00
Fabrice Di Meglio
0c6d1ba9db
am fa681f12: am 09d0ee26: Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev
...
* commit 'fa681f12ec645eaf2831e75abdd32c9987d6afa0':
Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
2013-04-16 16:23:44 -07:00
Fabrice Di Meglio
fa681f12ec
am 09d0ee26: Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev
...
* commit '09d0ee261d11396e1541c23d8f4f3f5d7e6a9e18':
Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
2013-04-16 16:19:53 -07:00
Fabrice Di Meglio
09d0ee261d
Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev
2013-04-16 23:15:17 +00:00
Fabrice Di Meglio
3a1f1e5bea
Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
...
- in AbsListView, force setScrollbarPosition() when RTL properties change
- in FastScroller, invalidate the correct rectangle when in RTL mode and in STATE_EXIT
Change-Id: Ie9fe4f826e179eb993e443d10e171b9dda3b6f3f
2013-04-16 15:40:18 -07:00
Jesse Hall
25beec154b
am b690c9a2: am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev
...
* commit 'b690c9a2210f020341ba68dd947b4e2ff43e007d':
Unhide android.opengl.GLES30 class and contents
2013-04-16 15:25:16 -07:00
Jesse Hall
b690c9a221
am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev
...
* commit 'c7bdd50c97d874456d0408599c1a6145186167dd':
Unhide android.opengl.GLES30 class and contents
2013-04-16 15:21:52 -07:00
Jesse Hall
c7bdd50c97
Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev
2013-04-16 22:17:20 +00:00
Jamie Gennis
6ad0452e63
Disable tracing from Zygote
...
This change disables all atrace tracing in Zygote immediately after it is
initialized. This is necessary because Zygote has no way to receive
notifications that the enabled trace tags have been changed. Tracing is
re-enabled when other processes fork from Zygote.
Change-Id: If2983858fb0c4890ba9ab041849b1c4d98f66c13
2013-04-16 22:15:21 +00:00
Irfan Sheriff
67c43942e1
am 26439185: am d12a7645: Merge "Fix enabling networks after driver stop" into jb-mr2-dev
...
* commit '264391856afc3f04aecbd0c0cd446a5caccb04e1':
Fix enabling networks after driver stop
2013-04-16 15:07:43 -07:00
Chris Craik
34416eaa1c
Make layer double drawing visible in overdraw debug mode
...
A clipped saveLayer will cause two draws - first to an onscreen
buffer, then again back to the framebuffer. This change - when in
overdraw debug - reissues draws associated with a clipped saveLayer,
but only to the stencil buffer. Operations within a saveLayer are
shown correctly to be twice drawn, and View.setAlpha() without an
associated hardware layer, or hasOverlappingRendering() are made more
visible.
Hardware layers, on any frame that they are updated, similarly draw
twice, and will also be counted against the stencil buffer doubly.
Note: greater depths of layers - e.g. a saveLayer within a saveLayer -
are not respected, as that would require additional region tracking.
Change-Id: I61fb0e61038fe66013d59914c20bb47a550dea7d
2013-04-16 15:05:49 -07:00
Irfan Sheriff
264391856a
am d12a7645: Merge "Fix enabling networks after driver stop" into jb-mr2-dev
...
* commit 'd12a7645a3bf3ffa83b8041bf343f1dc12a2381f':
Fix enabling networks after driver stop
2013-04-16 15:04:21 -07:00
Irfan Sheriff
d12a7645a3
Merge "Fix enabling networks after driver stop" into jb-mr2-dev
2013-04-16 22:00:11 +00:00
Svetoslav Ganov
c06464acf0
am 84677dff: am ad435ba7: Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev
...
* commit '84677dff59a663204743343e92fcab1ddbd057f4':
Send tab selection event from ScrollingTabContainerView.
2013-04-16 14:48:02 -07:00
Svetoslav Ganov
84677dff59
am ad435ba7: Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev
...
* commit 'ad435ba7fff45b8a15ebda08f88767511935a5d7':
Send tab selection event from ScrollingTabContainerView.
2013-04-16 14:45:38 -07:00
Svetoslav Ganov
ad435ba7ff
Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev
2013-04-16 21:41:09 +00:00
Jesse Hall
8065804653
am f454b52e: am 811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev
...
* commit 'f454b52ee7d7bdd2fe207860921ca58eeed19017':
Add android.opengl.GLES30, hidden for now
2013-04-16 14:38:59 -07:00
Jesse Hall
f454b52ee7
am 811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev
...
* commit '811d373444822b1a81cd6fb4f8ef87f6d49559b1':
Add android.opengl.GLES30, hidden for now
2013-04-16 14:35:40 -07:00
Jesse Hall
811d373444
Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev
2013-04-16 21:32:36 +00:00
Irfan Sheriff
b8df5451f4
Fix enabling networks after driver stop
...
Bug: 8630194
Change-Id: If897fc1fe54bf2f35362b8482e56d98f80a3130c
2013-04-16 14:16:18 -07:00
Wink Saville
b436a328a5
am bab00057: am c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
...
* commit 'bab000578d7ad6b380c558f28685d2303b64abc8':
Add mHasQuit to fix an NPE in StateMachine.
2013-04-16 13:41:10 -07:00
Wink Saville
bab000578d
am c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
...
* commit 'c6f2d17a0a6f9b172ff91247db12bc39a601f81c':
Add mHasQuit to fix an NPE in StateMachine.
2013-04-16 13:37:18 -07:00
Wink Saville
c6f2d17a0a
Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
2013-04-16 20:33:00 +00:00
Wink Saville
03812c7894
Add mHasQuit to fix an NPE in StateMachine.
...
After quiting mStateStack and other variables become
null so ignore all messages.
Bug: 8627228
Change-Id: I60150fb8023340768b38c2e72a8cbc982a59e0a8
2013-04-16 13:21:00 -07:00
Dmitry Shmidt
dfddc9e5cf
softap: Set broadcast option explicitly
...
Change-Id: I3f045b5427e68223d0b0be995d3d8c00a9ad21bc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-04-16 13:20:35 -07:00
Jaikumar Ganesh
b993c039af
am 6a622dcf: am 37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev
...
* commit '6a622dcf18fcb025766e26e1ac7b3138f92dc6e6':
Fix wrong index value.
2013-04-16 12:53:03 -07:00
Jaikumar Ganesh
6a622dcf18
am 37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev
...
* commit '37f58dccecd778f5af1f1f1db492c75ec5fcabd6':
Fix wrong index value.
2013-04-16 12:03:28 -07:00
Jaikumar Ganesh
37f58dccec
Merge "Fix wrong index value." into jb-mr2-dev
2013-04-16 18:59:32 +00:00
Jaikumar Ganesh
edb5242355
Fix wrong index value.
...
Rotation vector was at the wrong index value.
b/8165631
Change-Id: I50662befabf80393965c94a0335359019b98eb85
2013-04-16 11:59:07 -07:00
Daniel Sandler
1aec006be7
am 21f492b7: am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev
...
* commit '21f492b76a019828a3ff9785641c92dd548fed98':
Rebuild quick settings tile layouts.
2013-04-16 11:38:01 -07:00
Daniel Sandler
21f492b76a
am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev
...
* commit 'cfd48d77a2d11324ce8641a9cc178fb9f12500a3':
Rebuild quick settings tile layouts.
2013-04-16 11:35:48 -07:00
Daniel Sandler
cfd48d77a2
Merge "Rebuild quick settings tile layouts." into jb-mr2-dev
2013-04-16 18:33:10 +00:00
Svetoslav
1f65c79dbd
am a60c8c25: am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev
...
* commit 'a60c8c25fdd3c9c7ae6807f7c208697a989a7486':
BinderDied may be called after we unregistered the death recipient.
2013-04-16 11:32:29 -07:00
Romain Guy
dc7e79d66e
Merge "Fix indentation"
2013-04-16 18:30:56 +00:00
Svetoslav
a60c8c25fd
am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev
...
* commit '8297e68d84a6edc8ecb6d17d5ba2043075f921ff':
BinderDied may be called after we unregistered the death recipient.
2013-04-16 11:30:18 -07:00