130709 Commits

Author SHA1 Message Date
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
Baligh Uddin
88eeb81043 Import translations. DO NOT MERGE
Change-Id: I14399e867491e32386a481c24d98418be3f128b3
Auto-generated-cl: translation import
2014-05-07 14:56:32 -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
Dmitry Grinberg
5ae1c4f708 Merge "DO NOT MERGE: change preloaded classes" into klp-modular-dev 2014-05-07 21:39:44 +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
Baligh Uddin
bf37476825 Import translations. DO NOT MERGE
Change-Id: I120dc14038baa40159d1773e70cb31468ed54843
Auto-generated-cl: translation import
2014-05-07 14:31:26 -07: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
Jason Sams
26e9051957 Add flags to context creation for RS
We have a number of context options exposed though native
that were not available though the Java API.  This brings them
to parity.  Will finish plumbing in a follow on CL.

Change-Id: I8c65ee743d0e750e418304127b84088f25176c38
2014-05-07 14:23:46 -07:00
Amith Yamasani
1a7eaaa50e Send boot_completed for users started in the background
Bug: 14587584

Change-Id: I7abfad0a7102376e1665b528f3fd110a4b6ed164
2014-05-07 14:16:46 -07:00
Emily Bernier
394a6cdd98 New user restrictions for EDU
New user restrictions will allow schools to prevent students from 1) using
device microphones, 2) adjusting device volume, and 3) mounting physical
external media.

Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
2014-05-07 17:04:58 -04:00
John Reck
63a0667325 Implement TODO(romainguy)
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
2014-05-07 13:45:54 -07:00
Baligh Uddin
8152ee5e83 Import translations. DO NOT MERGE
Change-Id: I17154078eaa160864a641882dee6d7d49c56ff31
Auto-generated-cl: translation import
2014-05-07 13:38:21 -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
Russ Schnapp
c43a6bbe88 Fix erroneous javadoc example SyncRequest.Builder.setExtras
Change-Id: I2072a729b2db48d336590363509d9b8e9047c0bc
2014-05-07 12:56:13 -07: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
Jean-Michel Trivi
a713814f17 Unhide AudioTrack.write() method for non-blocking and ByteBuffer
Unhide the write mode constants.
Unhide the write method where data is stored in a ByteBuffer.

Bug 7919023

Change-Id: Ie9e24c744067f164d1a3e3363c7718b0a70e1cae
2014-05-07 12:10:06 -07: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
Kenny Guy
2871654830 Limit package launcher apps callback to enabled users.
Change-Id: I8e42756647025677203a7dfb1dd2d040ac6e32db
2014-05-07 18:41:29 +01: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
Craig Mautner
19ab828aa5 Account for windows on non-app display.
When an app launches a window on a different display than the one
the app is on, make sure and return the window's display, not the
app's display.

Fixes bug 12906650.

Change-Id: Ie418db023672f7944729fc60d457c4c1d850dc1f
2014-05-07 10:35:34 -07: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
Mindy Pereira
072c6033fd Make distance count when dismissing swipedismisslayout
verify the user's gesture took up at least 40% of the screen
before dismissing
Part of b/14319825 Cliff guard against accidental card dismissals

Works in conjunction with GridViewPager change:
https://googleplex-android-review.git.corp.google.com/#/c/461036/
Change-Id: Id8ff02d0a2d727b54c9950ad14ddef7a110f4eef
2014-05-07 10:06:55 -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