Kenny Guy
3a7c4a5669
Show notifications from related users.
...
When filtering notifications for user include those for users that
are related to the current user.
Pipe through user id so we know which user the notification is for.
Change-Id: I4e2657c23bd7b611d450be5a1f9457824bc062cb
2014-03-12 19:51:03 +00:00
Chris Craik
0e6ad3b86b
Merge "Force shadow casters above the Z=0 plane"
2014-03-12 19:22:28 +00:00
Chris Craik
b98f2116f5
Force shadow casters above the Z=0 plane
...
Change-Id: Ifee75414829d4bfb3c7aa6219f1f9bcfd50ff0c6
2014-03-12 11:19:42 -07:00
Mike Lockwood
5b568aa04a
Merge "MTP: Add support for battery level device property"
2014-03-12 17:58:05 +00:00
Dan Sandler
a07605fcd7
Merge "Insulate SystemUI from IDs in inflated notification views."
2014-03-12 17:18:43 +00:00
Chris Craik
d84133af44
Merge "Fix orthographic shadows projection, simplify shadow reordering"
2014-03-12 17:03:01 +00:00
Chris Craik
b79a3e301a
Fix orthographic shadows projection, simplify shadow reordering
...
Separate matrix passed to shadow system into two parts, one for
transforming the polygon XY points (using the actual draw matrix) and
a separate one which respects correct 4x4 3d rotations and
translations for determining Z values.
Change-Id: I7e30a84774a8709df6b2241e8f51fc5583648fe8
2014-03-12 09:44:41 -07:00
Mike Lockwood
56c85244b9
MTP: Add support for battery level device property
...
Bug: 7342482
Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
2014-03-12 08:46:47 -07:00
Jose Lima
9d50ea90f7
am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
...
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
Added LEANBACK_LAUNCHER Intent category
2014-03-12 15:19:37 +00:00
Robert Greenwalt
8d8b1b9cef
am 31734c35: (-s ours) am ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
...
* commit '31734c35bf3ebcbeaa14721aefd51df11c796345':
DO NOT MERGE Debounce wifi country code Info
2014-03-12 15:19:33 +00:00
Zhihai Xu
f110416dcc
am 42703d11: (-s ours) am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
...
* commit '42703d1199ea4770f505db0d5d8c9eb7d076e0d4':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
2014-03-12 15:19:30 +00:00
Vinit Deshapnde
fb403d5879
am 58795020: (-s ours) am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
...
* commit '58795020ef98789f5c5b942417ad0f23b6771221':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-12 15:19:27 +00:00
John Spurlock
f0b56b5805
am 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
...
* commit '2fcac8ba6fe870d78eca7b75c0e846a229f08819':
Fix doc typos in Vibrator.java
2014-03-12 15:19:23 +00:00
Scott Main
d0f2c01c5f
am 41b60030: am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
...
* commit '41b600304e6a2d007711ec814647e4dddbdd96ca':
fix some typos for GoogleApiClient doc
2014-03-12 15:19:19 +00:00
Scott Main
8a1e3ac58c
am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
...
* commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a':
fix typos
2014-03-12 15:19:14 +00:00
Neil Fuller
ad895779f8
Merge "Add APIs for better interoperability with Java 1.7"
2014-03-12 11:46:11 +00:00
Dan Sandler
6d94aa7a4e
Insulate SystemUI from IDs in inflated notification views.
...
We use the hidden View.setIsRootNamespace() in the same way
that AppWidgetHostView does: to block recursive ID search
traversals from traveling into notification views, which
might have children with IDs that collide with SystemUI's
own views. (Views inside notifications can still be located
by ID, but you need to start your search inside the
inflated notification row.)
Bug: 13421971
Change-Id: If8b81b9d0ed4b0eb6fa1e028275caa0b932f5759
2014-03-12 00:53:21 -04:00
Jeff Brown
f08ea09fc0
Merge "Retain display when creating specialized contexts."
2014-03-12 03:43:17 +00:00
Jeff Brown
defd4a6b04
Retain display when creating specialized contexts.
...
Fixed a bug that cause Context.createPackageContext() to discard
display information. Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.
As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.
Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
2014-03-11 19:30:00 -07:00
Jose Lima
c770e064ef
am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
...
* commit 'dd0db799ee25833a8989a823299f039ac31fef58':
Added LEANBACK_LAUNCHER Intent category
2014-03-11 23:20:32 +00:00
Robert Greenwalt
31734c35bf
am ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
...
* commit 'ee142967f60388d73c3bb99f321a781aa07f1eec':
DO NOT MERGE Debounce wifi country code Info
2014-03-11 23:20:28 +00:00
Zhihai Xu
42703d1199
am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
...
* commit 'cb714ae68e3d1c0047fdb6980fabcafcd57b37b6':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
2014-03-11 23:20:25 +00:00
Vinit Deshapnde
58795020ef
am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
...
* commit 'dbba6f076999afaad720c7c5657f7cbf9cdf2d14':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-11 23:20:22 +00:00
John Spurlock
2fcac8ba6f
am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
...
* commit 'b41c951fb1b2a27d3278948f809e90a7c203ca4b':
Fix doc typos in Vibrator.java
2014-03-11 23:20:19 +00:00
Scott Main
41b600304e
am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
...
* commit '60d18ceaf12ec24cea18d21121845dc4edcd5272':
fix some typos for GoogleApiClient doc
2014-03-11 23:20:16 +00:00
Scott Main
6fc25fb727
am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
...
* commit 'a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
fix typos
2014-03-11 23:20:13 +00:00
Dianne Hackborn
5c71949572
Merge "Reduce wake lock noise in battery history."
2014-03-11 22:59:21 +00:00
RoboErik
3484dff61d
Merge "Fix SDK build"
2014-03-11 22:46:06 +00:00
RoboErik
1ebd4ad6cd
Fix SDK build
...
Change-Id: I4bf73294cc9d970e17d1cddb840b53cc42155d14
2014-03-11 15:44:40 -07:00
Chris Craik
e361ad7ab1
Remove experimental perspective projection
...
Change-Id: Iad688c8395ccd4673cc129973802b5f01dfb45ba
2014-03-11 15:41:40 -07:00
Chris Craik
b26264948c
Merge "Improve shadow tessellation performance"
2014-03-11 22:35:46 +00:00
Chris Craik
726118b352
Improve shadow tessellation performance
...
- Tune and simplify shadow parameters
- Remove additional inner rings
- Improve polygon ray casting algorithm
Change-Id: If0f28b2d66ae0480b675942bb65e8fcd2864425d
2014-03-11 15:23:36 -07:00
Jose Lima
dd0db799ee
am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
...
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
Added LEANBACK_LAUNCHER Intent category
2014-03-11 19:19:11 +00:00
Robert Greenwalt
ee142967f6
am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
...
* commit 'e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
DO NOT MERGE Debounce wifi country code Info
2014-03-11 19:19:07 +00:00
Zhihai Xu
cb714ae68e
am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
...
* commit '74f36d31892d8fdfddbecc7bf3018aa3a190e5fb':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
2014-03-11 19:19:05 +00:00
Vinit Deshapnde
dbba6f0769
am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
...
* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-11 19:19:02 +00:00
John Spurlock
b41c951fb1
am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
...
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
Fix doc typos in Vibrator.java
2014-03-11 19:18:59 +00:00
Scott Main
60d18ceaf1
am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
...
* commit '212075889eab9aab2c48881803888a1b827d77ba':
fix some typos for GoogleApiClient doc
2014-03-11 19:18:55 +00:00
Scott Main
a17a7000f2
am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
...
* commit '2ada4e310d728756fc9bf69086987bfe215dc487':
fix typos
2014-03-11 19:18:48 +00:00
Winson Chung
303e1ff1fe
Initial changes for recents.
...
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
2014-03-11 12:03:08 -07:00
Jessica Hummel
4cfde32ff0
Merge "Move the provisioning intents to DevicePolicyManager."
2014-03-11 18:40:52 +00:00
Jose Lima
5f0c0498a1
Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
2014-03-11 18:08:53 +00:00
Jessica Hummel
f72078bdc5
Move the provisioning intents to DevicePolicyManager.
...
Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035
2014-03-11 18:05:29 +00:00
Robert Greenwalt
e5098b502c
am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
...
* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
2014-03-11 17:44:20 +00:00
Zhihai Xu
74f36d3189
am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
...
* commit 'c48c9626bd2eb91aab33a034baf139aa2b92671d':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
2014-03-11 17:43:56 +00:00
Vinit Deshapnde
2e76f5d8a2
am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
...
* commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-11 17:43:50 +00:00
John Spurlock
cb5f813bb6
am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
...
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
Fix doc typos in Vibrator.java
2014-03-11 17:43:46 +00:00
Scott Main
212075889e
am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
...
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
fix some typos for GoogleApiClient doc
2014-03-11 17:43:42 +00:00
Scott Main
2ada4e310d
am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
...
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
fix typos
2014-03-11 17:43:38 +00:00
Jose Lima
38b75b6126
Added LEANBACK_LAUNCHER Intent category
...
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
2014-03-11 10:43:31 -07:00