Chris Craik
f399e8679d
am 52ca5a6b: Merge "Remove isolated z volume test"
...
* commit '52ca5a6b08424e1d26c1e5ccbc762c3b1f4fbc1d':
Remove isolated z volume test
2014-04-11 22:50:43 +00:00
Chris Craik
6d3b26502e
am 286ffe4b: Merge "Remove use-after-free signal in RenderNode"
...
* commit '286ffe4b28d2c004ce98f7ddb3a5f34441ab0d80':
Remove use-after-free signal in RenderNode
2014-04-11 22:50:38 +00:00
Chris Craik
54a2ffef94
am dd35634c: Merge "Fix BitmapMesh buffer copy"
...
* commit 'dd35634cb0059b4b745161eb80234d8e8da38033':
Fix BitmapMesh buffer copy
2014-04-11 22:50:34 +00: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
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
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
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
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
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
John Spurlock
04286cdc09
am ae3f7cca: Merge "Add app_name to keyguard package."
...
* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
Add app_name to keyguard package.
2014-04-11 18:50: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
John Spurlock
2396e29d31
am ae3f7cca: Merge "Add app_name to keyguard package."
...
* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
Add app_name to keyguard package.
2014-04-11 18:48:17 +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
Winson Chung
ce6701d6f4
am f5bcd887: Merge "Refactoring filter animation logic."
...
* commit 'f5bcd8876e54aea8f228266ded5d9de8e6cad821':
Refactoring filter animation logic.
2014-04-11 18:44:37 +00:00
John Spurlock
ae3f7cca52
Merge "Add app_name to keyguard package."
2014-04-11 18:44:26 +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
Winson Chung
330e341430
am f5bcd887: Merge "Refactoring filter animation logic."
...
* commit 'f5bcd8876e54aea8f228266ded5d9de8e6cad821':
Refactoring filter animation logic.
2014-04-11 18:41:02 +00:00
Winson Chung
f5bcd8876e
Merge "Refactoring filter animation logic."
2014-04-11 18:38:32 +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
Winson Chung
11ca76a53c
Refactoring filter animation logic.
...
Change-Id: Ic3b57f540da8fa0d2703eef34c43ed9e54f85021
2014-04-11 11:36:03 -07:00
Narayan Kamath
97953b308f
am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
...
* commit '4f4892d00aab13975a8aed000f84ae0320355fd7':
Workaround 64 bit devices that don't have zygotes yet.
2014-04-11 18:33:00 +00:00