Daniel Sandler
f30d48290f
am 4735a1e1: Merge "New notification/settings panel handle assets." into jb-mr1-dev
...
* commit '4735a1e12cf240e12141b2a81475a52ffb0f7513':
New notification/settings panel handle assets.
2012-09-27 08:25:42 -07:00
Daniel Sandler
4735a1e12c
Merge "New notification/settings panel handle assets." into jb-mr1-dev
2012-09-27 08:23:28 -07:00
Daniel Sandler
4e32ba7ce7
New notification/settings panel handle assets.
...
Bug: 7171620
Change-Id: Ie6bc31345eafe91c03ca2bd09399419e54831f33
2012-09-27 10:34:41 -04:00
Satoshi Kataoka
159ca57009
am 2da2ec19: Merge "Fix imf flag" into jb-mr1-dev
...
* commit '2da2ec19e0e5d5b50575eb7ebe4e2e7f170647dc':
Fix imf flag
2012-09-27 04:09:15 -07:00
Satoshi Kataoka
2da2ec19e0
Merge "Fix imf flag" into jb-mr1-dev
2012-09-27 04:06:14 -07:00
Satoshi Kataoka
accd22aa63
Fix imf flag
...
Change-Id: I28a3155f329a3bd8b8a8f5d06b5ab21eba7d4558
2012-09-27 20:04:38 +09:00
Dianne Hackborn
8cd027f52b
am 66442c7e: Merge "Work on issue #7232641 : ISE crash when rotating phone in label list mode" into jb-mr1-dev
...
* commit '66442c7e7b86d0fb45e02b32b8750ed06b93ef06':
Work on issue #7232641 : ISE crash when rotating phone in label list mode
2012-09-27 00:56:59 -07:00
Dianne Hackborn
db9daf7597
am 2480bc12: Merge "Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev
...
* commit '2480bc12a525a55ebff453dbf6ca95258b9f23cf':
Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user
2012-09-27 00:55:07 -07:00
Dianne Hackborn
66442c7e7b
Merge "Work on issue #7232641 : ISE crash when rotating phone in label list mode" into jb-mr1-dev
2012-09-27 00:54:55 -07:00
Dianne Hackborn
2480bc12a5
Merge "Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev
2012-09-27 00:53:08 -07:00
Dianne Hackborn
f43a33c5ea
Work on issue #7232641 : ISE crash when rotating phone in label list mode
...
This doesn't fix the problem; I think it is an app problem. It does
improve a bunch of the debugging to help better identify what is going
on, and introduces some checks when adding a fragment to fail
immediately if we are getting into a state when a fragment is going to
be in the added list multiple times (which is pretty much guaranteed
to lead to a failure at some point in the future).
Change-Id: If3a8700763facd61c4505c6ff872ae66875afc8d
2012-09-27 00:51:56 -07:00
Dianne Hackborn
c7ba771a45
Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user
...
Also tweak bind flags for new location services so they
aren't put so aggressively up in the oom adj list.
Change-Id: I9da25a3fea7681013b4d95b7db7e9a808f2d733b
2012-09-26 23:22:59 -07:00
Jeff Brown
4ff4f4a39b
am 7bb89cf1: Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
...
* commit '7bb89cf1632da6dc236e6603c4245301500eeb39':
Cure narcolepsy.
Allow applications to connect to known wifi displays.
2012-09-26 20:23:13 -07:00
Jeff Sharkey
03d28b5974
am f21b94a8: Merge "Remove unused Secure settings." into jb-mr1-dev
...
* commit 'f21b94a8774f238daf90105a42bc6c140dd7dae2':
Remove unused Secure settings.
2012-09-26 20:21:22 -07:00
Jeff Sharkey
031c410adc
am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
...
* commit '68b7a6d14b68b38324ffd275c7227805c7d99b2d':
First step towards cleaning up Global settings.
2012-09-26 20:19:32 -07:00
Jeff Brown
7bb89cf163
Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
...
* changes:
Cure narcolepsy.
Allow applications to connect to known wifi displays.
2012-09-26 20:19:09 -07:00
Jeff Sharkey
f21b94a877
Merge "Remove unused Secure settings." into jb-mr1-dev
2012-09-26 20:17:44 -07:00
Jeff Sharkey
68b7a6d14b
Merge "First step towards cleaning up Global settings." into jb-mr1-dev
2012-09-26 20:15:45 -07:00
Stephen Hines
177bb01c7d
am 0b171158: Merge "RS char bug repro case" into jb-mr1-dev
...
* commit '0b1711582ff07d6d1e8e4de6c057eaf6a3473ac3':
RS char bug repro case
2012-09-26 19:07:07 -07:00
Stephen Hines
0391cc23ff
am c49c71a5: Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev
...
* commit 'c49c71a5c600485c395d95fd02fabde082e30177':
Restore RSTest functionality (char bug is fixed).
2012-09-26 19:05:30 -07:00
Stephen Hines
0b1711582f
Merge "RS char bug repro case" into jb-mr1-dev
2012-09-26 19:04:48 -07:00
Stephen Hines
c49c71a5c6
Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev
2012-09-26 19:03:21 -07:00
Jeff Brown
f9d40f4236
Cure narcolepsy.
...
Bug: 7204211
Change-Id: I2c09abaad5d321cec6f62f7ca0ce00c3b61ee211
2012-09-26 18:57:48 -07:00
Jeff Sharkey
f32fad0fe7
am dd78d462: Fix JNI method signature.
...
* commit 'dd78d462f6dceac71f9d1cbb723bb38a3b5bdc2e':
Fix JNI method signature.
2012-09-26 18:52:07 -07:00
Jeff Sharkey
dd78d462f6
Fix JNI method signature.
...
Change-Id: I156624e0ac55330f43d9c4d7f15d59f6c529aa0a
2012-09-26 18:46:08 -07:00
Jeff Brown
bc33545746
Allow applications to connect to known wifi displays.
...
Bug: 7177920
Change-Id: I9d8406e1016988e2cd267dfa52d78a829f1b385e
2012-09-26 18:34:47 -07:00
Jeff Sharkey
4de9936e85
Remove unused Secure settings.
...
Carefully leave default values intact in Watchdog for now.
Bug: 7232007, 7232230
Change-Id: Id944181109305aed41e0766fdd39625b43cb1d19
2012-09-26 17:58:19 -07:00
Amith Yamasani
d490f68664
am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
...
* commit '38796fe16266e22c56d2eee3eb63fac0cb926aaa':
Fix sync problems when setting up a new user and account
2012-09-26 17:48:35 -07:00
Amith Yamasani
38796fe162
Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
2012-09-26 17:46:37 -07:00
Philip Milne
ac4b97caed
am eed8f06f: Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
...
* commit 'eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2':
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
2012-09-26 17:34:10 -07:00
Philip Milne
eed8f06f7f
Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
2012-09-26 17:30:20 -07:00
Jeff Brown
ff7564ca18
am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-dev
...
* commit '0c9bbf4e13f2be6a4b930da2379c77e06a68c2cb':
Make DreamManagerService more robust.
2012-09-26 17:27:11 -07:00
Jeff Brown
0c9bbf4e13
Merge "Make DreamManagerService more robust." into jb-mr1-dev
2012-09-26 17:25:23 -07:00
Adam Powell
d03592587c
am 5a864aa0: Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
...
* commit '5a864aa0d8919d38b23c9e7e90455181d3a979e3':
ScaleGestureDetector bugfixes
2012-09-26 17:22:23 -07:00
Adam Powell
5a864aa0d8
Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
2012-09-26 17:20:37 -07:00
Jeff Sharkey
bdfce2ec05
First step towards cleaning up Global settings.
...
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
2012-09-26 17:18:49 -07:00
Jeff Brown
d689b98b9a
am ead9054f: Merge "Move DreamManagerService to its own package." into jb-mr1-dev
...
* commit 'ead9054f4efbbe2e2476ab56b082db44dab9fb28':
Move DreamManagerService to its own package.
2012-09-26 17:17:31 -07:00
Tim Murray
af442f8713
am 19744204: Merge "fix build break" into jb-mr1-dev
...
* commit '1974420465076bb9eee95a9e3ca1b09e3d506fd6':
fix build break
2012-09-26 17:15:53 -07:00
Jeff Brown
ead9054f4e
Merge "Move DreamManagerService to its own package." into jb-mr1-dev
2012-09-26 17:15:29 -07:00
Tim Murray
1974420465
Merge "fix build break" into jb-mr1-dev
2012-09-26 17:14:07 -07:00
Adam Powell
abde042a82
ScaleGestureDetector bugfixes
...
* Use radius, not diameter.
* Properly determine initial span on ACTION_DOWN.
Change-Id: Ia1dcff6589f8226181a9beaecef34440e9e16330
2012-09-26 17:12:50 -07:00
Tim Murray
0e3d40dfbd
fix build break
...
Change-Id: I51603e7c645ce7aaa632e88bdc44578094785fdd
2012-09-26 17:09:00 -07:00
Tim Murray
4268d5bffd
am c31c5433: Merge "fix blend intrinsics, add tests" into jb-mr1-dev
...
* commit 'c31c54332ece2053f8c03fa171d8702234f13df7':
fix blend intrinsics, add tests
2012-09-26 16:54:44 -07:00
Tim Murray
c31c54332e
Merge "fix blend intrinsics, add tests" into jb-mr1-dev
2012-09-26 16:52:21 -07:00
Romain Guy
1b0b7ca239
am 244a0bca: Merge "Make gradients beautiful again Bug #7239634 " into jb-mr1-dev
...
* commit '244a0bcadc167ed8519c7e34c62e116c1adc2dbe':
Make gradients beautiful again Bug #7239634
2012-09-26 16:51:41 -07:00
Romain Guy
244a0bcadc
Merge "Make gradients beautiful again Bug #7239634 " into jb-mr1-dev
2012-09-26 16:49:29 -07:00
Romain Guy
39284b763a
Make gradients beautiful again
...
Bug #7239634
This change passes two matrices to the vertex shader instead of one.
We used to compute the final MVP matrix on the CPU to minimize the
number of operations in the vertex shaders. Shader compilers are
however smart enough to perform this optimization for us. Since we
need the MV matrix to properly compute gradients dithering, this
change splits the MVP matrix into two. This has the advantage of
removing one matrix multiplication per drawing operation on the
CPU.
The SGX 540 shader compiler produces the same number of instructions
in both cases. There is no penalty hit with having two matrices
instead of one. We also send so few vertices per frame that it
does not matter very much.
Change-Id: I17d47ac4772615418e0e1885b97493d31435a936
2012-09-26 16:39:40 -07:00
Tim Murray
74478f73b7
fix blend intrinsics, add tests
...
Bug: 7190126
Change-Id: If69213377282bf5b412508e7af974a1f8d440287
2012-09-26 16:29:08 -07:00
Brian Carlstrom
cd4a962a84
am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
...
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
Reverting public setSoWriteTimeout
2012-09-26 16:09:03 -07:00
Dianne Hackborn
a5731c7fad
am 7b879999: Merge "Fix issue #7238170 : Edit picture option is not available for the secondary user." into jb-mr1-dev
...
* commit '7b879999fe2bef549ed1c04259fcd7f07e10e83b':
Fix issue #7238170 : Edit picture option is not available for the secondary user.
2012-09-26 16:07:14 -07:00