Fabrice Di Meglio
e3cd5f03af
am 1c3f4092: Merge "SearchIndexablesProvider - support for querying for non indexable data keys"
...
* commit '1c3f409284b47312c1c7e5d36283df9a05d29dfb':
SearchIndexablesProvider - support for querying for non indexable data keys
2014-04-14 19:14:13 +00:00
Evan Charlton
8c6d9e544e
resolved conflicts for merge of 352e1082 to master-nova
...
Change-Id: I6ab96bcc801d8c264908c89d465a9a7f49e1ef16
2014-04-14 11:53:39 -07:00
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
Jeff Brown
b631b43ced
am 15b0bef9: am 9e2fde9c: am d912e1f6: Use the display\'s actual state in the view hierarchy.
...
* commit '15b0bef9250e084bfbceb388716d28ed62ca018f':
Use the display's actual state in the view hierarchy.
2014-04-12 02:10:00 +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
a0790d3f8e
am efb40a0d: Merge "Update Javadoc for SearchIndexablesContract"
...
* commit 'efb40a0dba8874297b4dcf6a41e5d741c7f721e9':
Update Javadoc for SearchIndexablesContract
2014-04-12 00:31:48 +00: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
7f01896bde
am 777648cd: Merge "Support onHardwarePostDraw in ThreadedRenderer"
...
* commit '777648cde44c83b0e8c7b15473c9d7d29de653b7':
Support onHardwarePostDraw in ThreadedRenderer
2014-04-11 23:32:20 +00:00
Alan Viverette
a736818cc7
am 24e2e667: Merge "Clean up VolumePanel, tweak volume & brightness dialog styling"
...
* commit '24e2e6674d45acf22d9008368ee692746a5971ab':
Clean up VolumePanel, tweak volume & brightness dialog styling
2014-04-11 23:26:28 +00: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
Alan Viverette
24e2e6674d
Merge "Clean up VolumePanel, tweak volume & brightness dialog styling"
2014-04-11 23:01:11 +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
02f80877e2
am 296832e0: Merge "Fix constructors for SearchIndexableData and SearchIndexableResource"
...
* commit '296832e0e5ac007aecd5824dede840d1f403ced0':
Fix constructors for SearchIndexableData and SearchIndexableResource
2014-04-11 22:26:23 +00: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
792e41fe2a
am 8f993de8: Merge "Expose an API to generate a badged icon for managed profiles."
...
* commit '8f993de81f9e9bcfd136c42bb6bf12114fedfd36':
Expose an API to generate a badged icon for managed profiles.
2014-04-11 22:04:41 +00: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
Paul McLean
5dbe3d35c1
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:25:07 +00:00
Paul McLean
6eb0e0f576
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:25:03 +00: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
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
John Reck
d1950abf00
am c70f3db8: Merge "Simplify matrix calculations"
...
* commit 'c70f3db80ad522bdb5938b5944b3d9c7d7758f12':
Simplify matrix calculations
2014-04-11 20:21:18 +00: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
Aravind Akella
0507087ae0
am d951ab23: am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
...
* commit 'd951ab230d80631731ef12b5d76c678c30165d6a':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:44:01 +00:00
Aravind Akella
21e135773b
am d951ab23: am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
...
* commit 'd951ab230d80631731ef12b5d76c678c30165d6a':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:43:36 +00:00
Aravind Akella
d951ab230d
am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
...
* commit '8ebd66c259602f6b0be26fdfd3fe2f55538f6424':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:40:31 +00:00
Aravind Akella
8ebd66c259
am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
...
* commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:34:51 +00:00
Aravind Akella
cd4c1c714c
Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
2014-04-11 19:32:38 +00:00
Paul McLean
df3614693d
Implement USB Audio across Nexus Devices
...
Fix issues with connecting non-audio USB devices.
https://b.corp.google.com/issue?id=13745966
https://b.corp.google.com/issue?id=8281454
https://b.corp.google.com/issue?id=13751080
https://b.corp.google.com/issue?id=4643412
Change-Id: I1186f69a6c5f50279a1225a77fb5d4f7a8eda3cb
2014-04-11 12:18:44 -07:00
Jose Lima
25ae2446d4
am 68b9d975: am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()
...
* commit '68b9d97593d2ec79892813ab06f1b89c41de64b0':
Added getLeanbackLaunchIntentForPackage()
2014-04-11 19:07:56 +00:00
Jose Lima
8387fb1565
am 68b9d975: am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()
...
* commit '68b9d97593d2ec79892813ab06f1b89c41de64b0':
Added getLeanbackLaunchIntentForPackage()
2014-04-11 19:04:30 +00:00
Jose Lima
68b9d97593
am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()
...
* commit '9e99cab7d9a0ec2315140c21bb1958eb7ff76a09':
Added getLeanbackLaunchIntentForPackage()
2014-04-11 19:01:21 +00:00
Jose Lima
9e99cab7d9
am 970417c7: Added getLeanbackLaunchIntentForPackage()
...
* commit '970417c7d3e33ccbd6918e28d9bc5da24651f5b3':
Added getLeanbackLaunchIntentForPackage()
2014-04-11 18:58:43 +00:00
Narayan Kamath
411e16d4c2
am 6d8479d5: am 88a99645: am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
...
* commit '6d8479d535f99db1e957cbc1c3ac396cb26287ed':
Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:50:39 +00:00
Narayan Kamath
761f7f0c9e
am 6d8479d5: am 88a99645: am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
...
* commit '6d8479d535f99db1e957cbc1c3ac396cb26287ed':
Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:44:39 +00:00
Narayan Kamath
6d8479d535
am 88a99645: am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
...
* commit '88a996455b1f3906765cc177c461d38cc9bfda92':
Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:41:23 +00:00
Narayan Kamath
88a996455b
am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
...
* commit '97953b308f9159a73061ae047e368eac503c1931':
Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:36:32 +00:00
Svetoslav
05311a42e2
am 0f7ed1f4: Merge "Adding system support for a single accessibility focus."
...
* commit '0f7ed1f4776844f3ee8d3ce9d903f62cace66a06':
Adding system support for a single accessibility focus.
2014-04-11 18:26:42 +00:00
Narayan Kamath
2d84a406bf
Workaround 64 bit devices that don't have zygotes yet.
...
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.
For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.
bug: 13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
2014-04-11 19:24:53 +01:00