Fabrice Di Meglio
1c3f409284
Merge "SearchIndexablesProvider - support for querying for non indexable data keys"
2014-04-14 17:58:58 +00:00
Dan Sandler
352e108259
Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"
2014-04-14 17:54:22 +00:00
Baligh Uddin
245cbfb1fa
Import translations. DO NOT MERGE
...
Change-Id: I0c4a5560a6d7955bb97b50ef882ba11acc0760fd
Auto-generated-cl: translation import
2014-04-14 10:43:07 -07:00
Baligh Uddin
897da0c9a5
Import translations. DO NOT MERGE
...
Change-Id: I1d43a2f0495c5744cfea7c9a5932522c50f7492a
Auto-generated-cl: translation import
2014-04-14 10:36:50 -07:00
Baligh Uddin
8343a20437
Import translations. DO NOT MERGE
...
Change-Id: I06501e9574457274ef7b0a3951a1d76b8c50fdac
Auto-generated-cl: translation import
2014-04-14 10:06:45 -07:00
Baligh Uddin
bcf6441e61
Import translations. DO NOT MERGE
...
Change-Id: I06d9b9dea39d302df5f59242be6372413f854e3a
Auto-generated-cl: translation import
2014-04-14 10:01:43 -07:00
Narayan Kamath
db8b130a19
am 96457004: am 549ae327: am aa19a2f6: Merge "Don\'t compare String8s to NULL."
...
* commit '964570044ef6b5d721a1372b2bb65c4585947353':
Don't compare String8s to NULL.
2014-04-14 15:49:25 +00:00
Narayan Kamath
964570044e
am 549ae327: am aa19a2f6: Merge "Don\'t compare String8s to NULL."
...
* commit '549ae327245a844862065dc9bb0562544e8c3beb':
Don't compare String8s to NULL.
2014-04-14 08:46:17 +00:00
Narayan Kamath
549ae32724
am aa19a2f6: Merge "Don\'t compare String8s to NULL."
...
* commit 'aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
Don't compare String8s to NULL.
2014-04-14 08:41:42 +00:00
Narayan Kamath
aa19a2f69c
Merge "Don't compare String8s to NULL."
2014-04-14 08:18:25 +00:00
Narayan Kamath
90c75cf02e
Don't compare String8s to NULL.
...
Use String8::isEmpty instead. Note that this code path is hit
only if the zygote calls ::exit, and that never happens unless
the VM invocation fails.
Change-Id: I0e7d3a86a79b12b2174ca3bf0dbe1904e33c041a
2014-04-12 12:25:50 +01:00
Jeff Brown
dc800e8513
am eaa8a6b7: am a5c8d586: Fix build break due to layout lib.
...
* commit 'eaa8a6b7feb4a520f48654b087223ccaf49b6a2f':
Fix build break due to layout lib.
2014-04-12 08:45:06 +00:00
Jeff Brown
eaa8a6b7fe
am a5c8d586: Fix build break due to layout lib.
...
* commit 'a5c8d586f6ceff252336f72c6e15efbf4785e794':
Fix build break due to layout lib.
2014-04-12 08:22:06 +00:00
Alexandra Gherghina
bd924d2e61
Merge "Revert "Mark the keyguard package as required for profile""
2014-04-12 08:15:31 +00:00
Jeff Brown
a5c8d586f6
Fix build break due to layout lib.
...
Change-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf
2014-04-11 22:09:06 -07:00
Deepanshu Gupta
b7ba576cec
am c76faca6: (-s ours) am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
...
* commit 'c76faca60e0359e43e781eb3df403dc127733671':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:33:01 +00:00
Deepanshu Gupta
c76faca60e
am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
...
* commit 'e2dc69856879d41798545b2c113098195bf04fa6':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:30:31 +00:00
Deepanshu Gupta
e2dc698568
am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
...
* commit 'f1334ccc1522241c0efc2449ed8bf472a5b01204':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:26:09 +00:00
Deepanshu Gupta
f1334ccc15
am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
...
* commit '849a8208c88d38e55ec13a1fa76bf295fde96cb5':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
2014-04-12 02:23:04 +00:00
Jeff Brown
15b0bef925
am 9e2fde9c: am d912e1f6: Use the display\'s actual state in the view hierarchy.
...
* commit '9e2fde9c8a3557d6e8d1f3971a421ecdf5c2ce07':
Use the display's actual state in the view hierarchy.
2014-04-12 02:02:26 +00:00
Jeff Brown
9e2fde9c8a
am d912e1f6: Use the display\'s actual state in the view hierarchy.
...
* commit 'd912e1f6a111fb33118d116bd72da1a328041bca':
Use the display's actual state in the view hierarchy.
2014-04-12 01:58:57 +00:00
Jeff Brown
d912e1f6a1
Use the display's actual state in the view hierarchy.
...
Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false. However, this method
really describes the interactive state of the device rather than the
actual display state. This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.
This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.
Bug: 13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
2014-04-11 18:46:22 -07:00
Fabrice Di Meglio
97babb1e9a
SearchIndexablesProvider - support for querying for non indexable data keys
...
SearchIndexablesProvider should be able to send a list of data keys that
should not be indexed (mainly depending on some condition/state from the
device)
- update the contract by adding a new query named queryNonIndexableKeys(...)
Change-Id: Ie720825050acb600dca8ac8fed96fa4f59c3af71
2014-04-11 18:45:44 -07:00
Fabrice Di Meglio
efb40a0dba
Merge "Update Javadoc for SearchIndexablesContract"
2014-04-12 00:27:43 +00:00
Fabrice Di Meglio
a8e8f3f647
Update Javadoc for SearchIndexablesContract
...
- fix typo and update some comment
Change-Id: Id001290aa367ee2b8b0d6d9ca9098710e760ad31
2014-04-11 17:24:02 -07:00
John Reck
777648cde4
Merge "Support onHardwarePostDraw in ThreadedRenderer"
2014-04-11 23:23:59 +00:00
John Reck
bc0cc0220b
Support onHardwarePostDraw in ThreadedRenderer
...
Bug: 13958485
Change-Id: Ie9c7af7cee582850a7f0a3d891aa3685c230cfc7
2014-04-11 16:16:48 -07:00
ztenghui
9bd18f9957
Merge "Make sure control points are in absolute coordinates"
2014-04-11 23:07:46 +00:00
Alan Viverette
24e2e6674d
Merge "Clean up VolumePanel, tweak volume & brightness dialog styling"
2014-04-11 23:01:11 +00:00
ztenghui
175f3c892c
Make sure control points are in absolute coordinates
...
Change-Id: I1b90fe39f9dc77e1a1b7b4b512cd11f5734fbf8f
2014-04-11 15:59:15 -07:00
Chris Craik
52ca5a6b08
Merge "Remove isolated z volume test"
2014-04-11 22:46:25 +00:00
Chris Craik
286ffe4b28
Merge "Remove use-after-free signal in RenderNode"
2014-04-11 22:46:20 +00:00
Chris Craik
dd35634cb0
Merge "Fix BitmapMesh buffer copy"
2014-04-11 22:46:07 +00:00
Alan Viverette
e8ebaf3f6f
Clean up VolumePanel, tweak volume & brightness dialog styling
...
Change-Id: Ibd008fbc6acab00bf642422cb322ec147799d3d7
2014-04-11 15:44:15 -07:00
Fabrice Di Meglio
296832e0e5
Merge "Fix constructors for SearchIndexableData and SearchIndexableResource"
2014-04-11 22:19:23 +00:00
Fabrice Di Meglio
773a56bbf4
Fix constructors for SearchIndexableData and SearchIndexableResource
...
- fix locale initialization
- fix constructor chain
Change-Id: Id072574cca79fd49013e0b796b98a12d0bb8459f
2014-04-11 15:15:34 -07:00
Amith Yamasani
8f993de81f
Merge "Expose an API to generate a badged icon for managed profiles."
2014-04-11 22:01:16 +00:00
Amith Yamasani
7dda2657be
Expose an API to generate a badged icon for managed profiles.
...
Change-Id: I6257f43934ba6eefe752003942d8d3bcf207d5f9
2014-04-11 14:57:12 -07:00
Jorim Jaggi
f3e3140696
Merge remote-tracking branch 'goog/master-lockscreen-dev'
...
Bug: 13635952
Change-Id: Iae69d798155e3aa7e8d94de45977115e16ec66de
2014-04-11 23:26:00 +02:00
Paul McLean
b755253f28
am fd7d3108: Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."
...
* commit 'fd7d31087bcd40b825b0eee3058e2298d8648e9f':
Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices.
2014-04-11 21:21:23 +00:00
Paul McLean
1f396ec3f6
am d1d7c491: Merge "Revert "Revert "Initial implementation of USB Audio output."""
...
* commit 'd1d7c491601a3fd1547c31606e1b8386db068b9c':
Revert "Revert "Initial implementation of USB Audio output.""
2014-04-11 21:21:20 +00:00
Chris Craik
dcc206dd76
Remove isolated z volume test
...
Change-Id: I757cd9445b7e8f564b5f1357d3e5c17032daf17e
2014-04-11 14:20:08 -07:00
Paul McLean
fd7d31087b
Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."
2014-04-11 21:18:51 +00:00
Paul McLean
d1d7c49160
Merge "Revert "Revert "Initial implementation of USB Audio output."""
2014-04-11 21:18:35 +00:00
Jorim Jaggi
fe5fffd33b
Fix incoming phone calls on lockscreen.
...
Change-Id: I5a142fb51052c48bd4db76a1be2abf5584668d0e
2014-04-11 21:13:28 +00:00
Chris Craik
143912fef8
Remove use-after-free signal in RenderNode
...
bug:9321162
mDestroyed is no longer useful, as RenderNode is ref counted (not to
mention having its lifecycle significantly redesigned).
Change-Id: I429b9dd7740362c85d6416fbae567f0d47098e4e
2014-04-11 13:48:46 -07:00
Chris Craik
0664fef9e2
Fix BitmapMesh buffer copy
...
Change-Id: I7c1a3651c7d91d7ff37ecbe18d974fa8cb1cf415
2014-04-11 13:40:05 -07:00
John Reck
3758304ca9
am c70f3db8: Merge "Simplify matrix calculations"
...
* commit 'c70f3db80ad522bdb5938b5944b3d9c7d7758f12':
Simplify matrix calculations
2014-04-11 20:17:35 +00:00
John Reck
c70f3db80a
Merge "Simplify matrix calculations"
2014-04-11 20:14:46 +00:00
John Reck
f7483e3af0
Simplify matrix calculations
...
Bug: 13913604
Change-Id: I2c0f85a34e1e520050a5a6131306d6b7c352d827
2014-04-11 12:57:53 -07:00