130501 Commits

Author SHA1 Message Date
John Reck
ae493d967f Merge "Allow all loopers to be RT-accelerated" 2014-05-07 23:16:52 +00:00
Jason Monk
fab0126136 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
2014-05-07 22:57:45 +00:00
John Reck
030d619aaa Allow all loopers to be RT-accelerated
Bug: 14445956

Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
2014-05-07 15:46:36 -07:00
Florin Malita
531fecca1c Merge "Encapsulate Canvas.mNativeCanvas" 2014-05-07 22:44:47 +00:00
Jason Monk
faf3fd59d5 Fix Docs breakage
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
2014-05-07 18:41:13 -04:00
Brian Carlstrom
dfad99ad9f resolved conflicts for merge of 0b5598c9 to master
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
2014-05-07 15:24:01 -07:00
Selim Gurun
b5a449e488 Merge "Fix build" 2014-05-07 22:08:31 +00:00
Brian Carlstrom
095652d3cb Merge "resolved conflicts for merge of 3bbef521 to master" 2014-05-07 22:06:24 +00:00
Selim Gurun
5ba69bef8c Fix build
Fix the java reflection to have the devices boot again.

Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
2014-05-07 15:04:40 -07:00
Winson Chung
945c27836b Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants." 2014-05-07 22:04:16 +00:00
Winson Chung
814086db67 Disabling shadowing (until bugs are addressed) and refactoring some constants.
Change-Id: Iaf4c98bcb13441be3e66048687ea5b0673d2bce6
2014-05-07 15:01:14 -07:00
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
2014-05-07 14:46:40 -07:00
Jorim Jaggi
4f0128fb8f Merge "New layout structure for the expanded status bar." 2014-05-07 21:43:14 +00:00
Jim Miller
46426009a5 am 424edf06: am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
* commit '424edf064fb705b07f5f7d41e875dd2b24ccf271':
  Fix can't change airplane mode from GlobalActions.
2014-05-07 21:40:15 +00:00
John Reck
832b151465 Cleanup attachFunctor
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
2014-05-07 21:33:23 +00:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
John Reck
841057ffc0 Merge "Don't try to draw if there's no canvas or surface" 2014-05-07 21:24:23 +00:00
John Reck
63a0667325 Implement TODO(romainguy)
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
2014-05-07 13:45:54 -07:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
0b5598c924 am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService"
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
  Add BackgroundDexOptService
2014-05-07 20:28:25 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
2014-05-07 13:20:23 -07:00
John Reck
368cdd8526 Don't try to draw if there's no canvas or surface
Bug: 14616376

 doFrame() can happen after the canvas or surface is destroyed,
 handle it gracefully

Change-Id: Ibbbbdbfa77fa2134bd2abc215ca1a0886d706969
2014-05-07 13:19:28 -07:00
Jorim Jaggi
603d270a53 Merge "Add intermediate lock icon so users know how to unlock." 2014-05-07 20:18:35 +00:00
Jorim Jaggi
47a7b0769f Add intermediate lock icon so users know how to unlock.
Bug: 14381296
Change-Id: I51c63dd5ba9a26b7e03be092482f4c4f69b31754
2014-05-07 22:10:17 +02:00
Jason Monk
f2e074604b Fix Build
Change-Id: I0035256b41199041bc1bc7d625f2c8f5a6a23e43
2014-05-07 15:59:10 -04:00
Jim Miller
424edf064f am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
* commit 'cc6b9eb23c3a6168d6cb5cb10977c43ebdcbbea4':
  Fix can't change airplane mode from GlobalActions.
2014-05-07 19:44:28 +00:00
Jason Monk
54a9ebb509 Fix build
Change-Id: I87c037faee19b434be741104cdddb9c467f20606
2014-05-07 15:26:34 -04:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00
Jason Monk
a57e5e006b Make Lock Task API public.
Change-Id: Ieaf944dc69e206e091d8257e0f92013b082ceaac
2014-05-07 15:15:53 -04:00
Jason Monk
9d75ccb6a1 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Alan Viverette
39882e0813 Merge "Non-animated checkbox" 2014-05-07 18:33:37 +00:00
Alan Viverette
aa2b473412 Non-animated checkbox
BUG: 14603986
Change-Id: I9ed24fabf50db6100c60257fbc53a4488ba8e000
2014-05-07 11:33:02 -07:00
Jason Monk
207900c23b Make proxy API public
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
2014-05-07 14:23:53 -04:00
Ying Wang
b853fd064e Merge "Check doc comments when you run update-api." 2014-05-07 18:21:53 +00:00
Jorim Jaggi
d7daab7b9e New layout structure for the expanded status bar.
This also includes a new (very WIP) interaction to get to quick
settings, with clumping the cards and a scrollable container with
the cards and the bottom QS part in it.

Change-Id: Ib073bb0174cddcf60347a5e3bb474fb3b6385bcf
2014-05-07 19:49:23 +02:00
Jorim Jaggi
2322ae82e9 Merge "Improved interception logic of the PanelView" 2014-05-07 17:45:31 +00:00
Selim Cinek
172e914178 Improved interception logic of the PanelView
It was previously possible to get into undesired states when closing
the shade and clicking on it in midtransition. This was also triggered
when double tapping a card.

Bug: 14130526
Change-Id: I6b73f348dba4ee21d2401004176a9c6cc0c59745
2014-05-07 19:38:00 +02:00
Amith Yamasani
11da8a8aee Merge "Fix javadoc typo" 2014-05-07 17:26:59 +00:00
Ying Wang
ed896004d6 Check doc comments when you run update-api.
Bug: 14614668
Change-Id: I7ae8de19b51aeaeef70e2ba8bfa268ec70dfaf64
2014-05-07 10:26:44 -07:00
RoboErik
153187d05b Merge "Add a class for managing Session priority" 2014-05-07 17:26:28 +00:00
RoboErik
780bee2633 Merge "Add APIs for creating a system priority session and getting controllers" 2014-05-07 17:26:16 +00:00
Amith Yamasani
007bbc0ed3 Fix javadoc typo
Use @return, not @returns

Change-Id: I6c8fab2d236cf9c68c79090d3830bc3e01c8aa6f
2014-05-07 10:23:44 -07:00
Guang Zhu
4297409e45 resolved conflicts for merge of 1e8a87dd to master
Change-Id: Id51218b4e2ca06344b5e7596ebde355fba9cfa54
2014-05-07 09:51:11 -07:00
Craig Mautner
77f5a0f517 Merge "Add attributes and flags for DocCentric." 2014-05-07 16:00:03 +00:00
Selim Cinek
0be30834b4 Merge "Improved notification scroller animation logic" 2014-05-07 15:42:42 +00:00
Craig Mautner
2dac056179 Add attributes and flags for DocCentric.
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: I04acc9333c3725b4db94a954358eb78df507ff53
2014-05-07 08:41:27 -07:00