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
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
Jamie Gennis
95a869f91b
Merge "Disable tracing from Zygote" into jb-mr2-dev
2013-04-16 23:55:33 +00: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
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
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
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
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
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
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
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
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
Svetoslav
8297e68d84
Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev
2013-04-16 18:27:43 +00:00
Chet Haase
b718735aae
am b2488931: Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev
...
* commit 'b2488931cbd25c0e9dbc648882e272048c075741':
Avoid repositioning unattached overlay views
2013-04-16 11:02:29 -07:00
Chet Haase
b2488931cb
Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev
2013-04-16 17:58:37 +00:00
John Spurlock
4f63f54fde
am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev
...
* commit '5584737fff6350ab09fb53e6a73bbff770930727':
FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
2013-04-16 06:26:51 -07:00
John Spurlock
5584737fff
Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev
2013-04-16 13:23:47 +00:00
Dirk Dougherty
12d0071a65
am 83d90b20: am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
...
* commit '83d90b200babe43d5e91cef1bbcf0b224f48e16d':
Doc change: Add tablet basic checks.
2013-04-15 22:03:10 -07:00
Dirk Dougherty
83d90b200b
am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
...
* commit 'ce2c3de716dd77db8f1280f939312c36ebd297ea':
Doc change: Add tablet basic checks.
2013-04-15 21:59:53 -07:00
Dirk Dougherty
ce2c3de716
am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
...
* commit 'aac8d988e1f1863e51d3296f09373c2939137e09':
Doc change: Add tablet basic checks.
2013-04-15 21:56:09 -07:00
Dirk Dougherty
aac8d988e1
am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
...
* commit '14ad06cf2fc4b78182f6df4b4ebaa78453b68ff4':
Doc change: Add tablet basic checks.
2013-04-15 21:52:26 -07:00
Dirk Dougherty
14ad06cf2f
am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
...
* commit '25afd5d063b7f6bcb0f5d6bf93ac1015a5a89869':
Doc change: Add tablet basic checks.
2013-04-15 21:49:14 -07:00
Dirk Dougherty
25afd5d063
am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
...
* commit 'd1dc8c70786fdeae1c0de39d4ded896663588203':
Doc change: Add tablet basic checks.
2013-04-15 21:46:52 -07:00
Dirk Dougherty
d1dc8c7078
am c6af49ef: Doc change: Add tablet basic checks.
...
* commit 'c6af49efc467e379e7ac56246e9c7f0e6ebddc00':
Doc change: Add tablet basic checks.
2013-04-15 21:43:56 -07:00
Dirk Dougherty
c6af49efc4
Doc change: Add tablet basic checks.
...
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
2013-04-15 20:55:25 -07:00
Stan Chesnutt
464f4ea355
am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
...
* commit 'b34b3211e01b0ae946f786b220f73d340159503b':
Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
2013-04-15 19:52:52 -07:00
Stan Chesnutt
b34b3211e0
Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
2013-04-16 02:49:45 +00:00
Stan Chesnutt
1d72d8c33d
Re-introduce single-shot mode, set MS Assist Mode A when in
...
single-shot mode.
Fixes bug http://b.corp.google.com/issue?id=8204392
Change-Id: I5594447c75abab6b71bd12706409666bb75736c5
2013-04-15 19:18:02 -07:00
Daniel Sandler
b5538e6421
Rebuild quick settings tile layouts.
...
The chief motivation here is to allow two lines of text when
necessary. So much refactoring over so small a thing, but
the result is satisfying: most quick settings tiles do not
need their own layouts. Additionally, tiles with odd-shaped
icons (I'm looking at you, alien potato mode) no longer fall
off the grid.
It should be possible to further reduce the complexity of
quick settings, but for now this will suffice.
Bug: 7216734 // vertical alignment issues
Bug: 7216868 // wrap text in QS tiles
Bug: 7365911 // NPE in some tiles
Change-Id: I0c6ef275e44f745dfac52c2a7303072ae48e3873
2013-04-15 22:09:55 -04:00
Daniel Sandler
0a8ed3f214
am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
...
* commit '4b6d23d7b45f813bee52747b3243ce46ff9edbd0':
Further reduce memory usage of notification archive.
2013-04-15 18:48:06 -07:00
Daniel Sandler
4b6d23d7b4
Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
2013-04-16 01:44:11 +00:00
Daniel Sandler
5e62e3aa7d
Further reduce memory usage of notification archive.
...
- Max 250 notifications preserved (was 1000)
- Known heavyweight extras are removed
- print some of 'em out in dumpstate, while we're at it
Bug: 8280039
Bug: 8537938
Change-Id: I9239128c32a1d9f5ef4e0dc62dc2d23e190871e9
2013-04-16 01:43:49 +00:00
Daniel Sandler
220fa85eac
am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev
...
* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
Finish annotating Notification.extras.
2013-04-15 18:42:33 -07:00
Daniel Sandler
f094d221e5
Merge "Finish annotating Notification.extras." into jb-mr2-dev
2013-04-16 01:38:54 +00:00
Jesse Hall
58d80c53c0
Unhide android.opengl.GLES30 class and contents
...
Bug: 8566953
Change-Id: I5273fb3bff642da5ff1eecb5899e8051402b19ca
2013-04-15 17:38:36 -07:00
Jesse Hall
d830e74ff4
Add android.opengl.GLES30, hidden for now
...
Bug: 8566953
Change-Id: Ia5a01d5e857b4fce12a451e2dcab0359758ad648
2013-04-15 17:37:33 -07:00