189038 Commits

Author SHA1 Message Date
Rich Slogar
1fcc6bd854 Merge "docs: studio remove gradle tasks dialog" into lmp-docs 2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7 Merge "docs: hierarchyviewer updates" into lmp-docs 2015-04-17 16:52:45 +00:00
Wen ZHANG
fedd63165d Merge "Set REQUIRE_PASSWORD_TO_DECRYPT to false when insecure screen lock is enabled" 2015-04-17 16:41:27 +00:00
Michael Wright
fd25459a52 Merge "Rename affine transformation configuration change to be consistent." 2015-04-17 16:38:53 +00:00
Olawale Ogunwale
5c75f0fbe3 am 2051bded: am 53e2c6ec: am c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '2051bded279f2d81e89b2a3731d1ba164ff9054a':
  [ActivityManager] Fix activity always visible.
2015-04-17 16:36:02 +00:00
Andres Morales
301ea44992 Recover from dead GateKeeperService Binder
Change-Id: Ie25b46225a88fd59e6426a338bb94152d2c1b302
2015-04-17 09:35:57 -07:00
Wale Ogunwale
f645f9420c Merge "Fail early when starting a background user activity." 2015-04-17 16:28:24 +00:00
Olawale Ogunwale
2051bded27 am 53e2c6ec: am c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '53e2c6ec87e6969b5f0db2ab92a9fa133317bd29':
  [ActivityManager] Fix activity always visible.
2015-04-17 16:23:40 +00:00
Tony Mantler
991465c655 Merge "Add PermissionsInfo to SettingsLib" 2015-04-17 16:13:39 +00:00
Olawale Ogunwale
53e2c6ec87 am c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit 'c0c8d1983c5d7c9bc9469944a9d46856aff95ab9':
  [ActivityManager] Fix activity always visible.
2015-04-17 16:13:03 +00:00
Luan Nguyen
b5890f9b45 docs: Add Channel API summary for Wear.
bug: 20089257
Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
2015-04-17 09:12:16 -07:00
Olawale Ogunwale
c0c8d1983c Merge "[ActivityManager] Fix activity always visible." 2015-04-17 15:50:48 +00:00
Wale Ogunwale
0bd2aa7603 Fail early when starting a background user activity.
If it shouldn't be displayed for all users.

Bug: 13507605
Change-Id: I8fe8e5a98759c1ca058cc7d222817f6d580ffa11
2015-04-17 08:37:56 -07:00
Chet Haase
8a2c92c834 Merge "Add transient views to ViewGroup" 2015-04-17 12:34:11 +00:00
Tom Hudson
9543c0be95 Merge "Fix offset of composeLayerRegion" 2015-04-17 12:02:48 +00:00
Abodunrinwa Toki
103d48ec09 Change FloatingToolbar window layout type.
Floating toolbar is now rendered as TYPE_APPLICATION_ABOVE_SUB_PANEL.
This causes the FloatingToolbar to be rendered in a layer above
the text selection handles (at layer TYPE_APPLICATION_SUB_PANEL.)

Bug: 20135562
Change-Id: I1484b3493bf4cd98c679eb222270c53daa46cdf4
2015-04-17 07:58:37 +00:00
Martijn Coenen
4598c375df am 14e24b4b: am cb477625: am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit '14e24b4b4495484c05f38cab1b5b3ae8443394a6':
  Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:47:00 +00:00
Martijn Coenen
14e24b4b44 am cb477625: am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit 'cb4776254c92e4b8c05e2bd60e730aa76b55358f':
  Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:37:47 +00:00
Martijn Coenen
cb4776254c am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit 'e386f7f5108e9c2aa7547394f23d5936d7993cfe':
  Expose peer LLCP version in NDEF callbacks.
2015-04-17 07:25:27 +00:00
Andy Hung
4aacc903e3 Add non-blocking writes to AudioTrack
Change-Id: I4ff47c2851be1b085f4e758f67e391932371027d
2015-04-17 00:16:17 -07:00
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00:00
Andy Hung
0e9e2f3724 Add non-blocking reads to AudioRecord
Change-Id: I63d5345129f197f96f9a13696996071c96551efe
2015-04-16 23:57:13 -07:00
Adrian Roos
e57818a20e Merge "Allow dismissing Keyguard from TrustAgentService" 2015-04-17 02:44:09 +00:00
Filip Gruszczynski
54ce1cafb0 am cba75f31: am 47e743b9: am 4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit 'cba75f315967bba103805046b122e9a58687b85d':
  Hold a wake lock while dozing when wallpaper draws.
2015-04-17 02:09:40 +00:00
Ryosuke Matsuuchi
19a7b54619 doc: Add Korean version of DAC/distribute/ page.
Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
2015-04-17 10:57:31 +09:00
Adam Lesinski
a4766050c5 Merge "Report WiFi and Bluetooth energy collection in checkin stats" 2015-04-17 01:54:19 +00:00
Jim Miller
1304137918 Clean up message dispatch in FingerprintService
This fixes several issues that were causing missing events in
enrollment and authentication.

Bug 20271180

Change-Id: Ic1c8ab35145de4d29d60238ef8ee71443a882348
2015-04-16 18:45:05 -07:00
Adam Lesinski
e283d33fed Report WiFi and Bluetooth energy collection in checkin stats
Also removed some legacy bluetooth energy collection
that was never invoked.

Also fixed an issue with Wifi scan power estimation.

Bluetooth energy recording is still disabled as strange results
are still reported.

Change-Id: Iafa37eba285fd933ff221116b14af260e904fa4f
2015-04-16 18:44:30 -07:00
Andres Morales
e4e13b4a97 Merge "Clear secure user ID and notify keystore when lock is cleared" 2015-04-17 01:34:57 +00:00
Filip Gruszczynski
cba75f3159 am 47e743b9: am 4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit '47e743b9e276d89ded2b9c50af61db2ce5529706':
  Hold a wake lock while dozing when wallpaper draws.
2015-04-17 01:20:09 +00:00
Ben Kwa
d58d954a15 Enable the copy feature.
Change-Id: Ie0636895f2b2fe6550eb68042295daf76bbbd7fe
2015-04-16 18:17:25 -07:00
Adrian Roos
94e15a59b7 Allow dismissing Keyguard from TrustAgentService
Bug: 19900313
Change-Id: I44d13ee6fe65070327076e73a3ed96c94acdc108
2015-04-17 01:12:30 +00:00
Daichi Hirono
fbad74b29c Merge "Stop to take multiline file name in the create directory dialog." 2015-04-17 00:59:51 +00:00
Filip Gruszczynski
47e743b9e2 am 4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit '4544b927d7f3575bf609490b42d521a12bf95a07':
  Hold a wake lock while dozing when wallpaper draws.
2015-04-17 00:59:39 +00:00
Dianne Hackborn
a985bfb44c Merge "Some improvements to battery stats data." 2015-04-17 00:43:10 +00:00
Dianne Hackborn
0c820db22c Some improvements to battery stats data.
History now records when wifi data activity starts and "ends"
based on the triggers we get from the kernel used to determine
when to collect data.  (Basically the same as the current cell
data, but of course when it ends is just an arbitrary x seconds
after the last data traffic.)

Re-arranged the state bits to make room for this data in the
right place and move some other things that make more sense to
have in states2.

Try to improve overflow handling, so when it happens we allow
the various bit states to drop to 0 instead of being stuck
active for an indeterminant amount of time.

Added recording of the points where we decide we want to
retrieve new power stats, giving the reason for doing so.
These are only recorded when full logging is turned on.

Change-Id: Ic5d216960a07e0eb658731cdfba7f49ad3acf67e
2015-04-16 17:40:37 -07:00
Chet Haase
c633d2f2b8 Add transient views to ViewGroup
This change allows clients to add temporary (transient) views to a
list of such views in any layout container. These views will be drawn at
the specified index when the container is being rendered, but will otherwise
not participate in the normal events of child views, such as focus,
input, and accessibility. The purpose of this functionality is to
enable better animations when views have been removed, such that clients
can add them back into containers temporarily while an animation runs,
then remove them when the animation finishes. This functionality is similar,
albeit a subset, of the what ViewGroupOverlay provides, but this API
allows clients to interleave these views with the other children in
the container, which allows correct drawing order. ViewGroupOverlay,
and the older internal mechanism used by the old animation package,
draw all of their views after a container is drawn, which pops
these temporary views on top of the other children in the container.

Issue #18621099 Enable View overlay to respect elevation and shadows

Change-Id: I530df69b406aa27b9f551f5724384f4dd1215a6f
2015-04-17 00:30:21 +00:00
Eric Laurent
71a9cfc08c Merge "Adding explicit routing API to AudioTrack" 2015-04-17 00:30:03 +00:00
Andrew Lee
51c050a3c5 Merge "Remove deprecated VideoCallListener methods." 2015-04-17 00:08:23 +00:00
Andrew Lee
84a264004d Remove deprecated VideoCallListener methods.
These shouldn't be needed because the video call APIs were never
previously made public.

Bug: 20160491
Change-Id: Ic9c5d0d1e8618bfe61f8905d4afaeaa37f51c915
2015-04-16 17:07:12 -07:00
Filip Gruszczynski
05636471fc Merge "Make UNSPECIFIED measure spec include size hint." 2015-04-17 00:03:22 +00:00
Michael Wright
357285c50a Rename affine transformation configuration change to be consistent.
Change-Id: I295d1d07f3727e6d0159e1ccf210ae147fd7ffa3
2015-04-17 00:50:31 +01:00
Andrew Lee
600aaf013a Merge "Fix comment typos. =(" 2015-04-16 23:46:57 +00:00
Santos Cordon
223a80d7c6 Merge "Unfinal getPhone." 2015-04-16 23:42:01 +00:00
Jinsuk Kim
f8e24ccf37 Merge "CEC: Do not terminate ARC on send error busy" 2015-04-16 23:33:49 +00:00
Andres Morales
cfb61601fa Clear secure user ID and notify keystore when lock is cleared
Change-Id: Id5bbde81b83add09e8362d439b19f1febe451003
2015-04-16 16:31:50 -07:00
P.Y. Laligand
9d93a378c5 Consistent null-checking in MediaRouter.
b/19747094

Change-Id: I5f8d086f717a11a9d03874e633471efed787a6c3
2015-04-16 16:22:35 -07:00
Santos Cordon
29886d8571 Unfinal getPhone.
The change to make it final was breaking existing apps.

...and other changes.

Bug: 20283873
Change-Id: I8db4243850ad15f688dbca59ff5427b4799cbd1b
2015-04-16 16:12:20 -07:00
Jay Shrauner
d01242946e Merge "Remove connection substate" 2015-04-16 23:06:05 +00:00
Adam Powell
54832cdb76 Merge "Clear ViewGroup nested scrolling axes when nested scrolling stops" 2015-04-16 22:58:39 +00:00