Commit Graph

51039 Commits

Author SHA1 Message Date
Svet Ganov
d3c1ddb892 Merge "Add OP_READ_PHONE_STATE app op - framework" 2015-04-17 21:34:04 +00:00
John Reck
9d4efdf280 Revert "A bunch more cleanups"
This reverts commit c294d128d0.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
2015-04-17 20:47:27 +00:00
John Reck
7809f835ca Revert "Move AssetAtlas off of SkBitmap*"
This reverts commit 87ffb63d90.

Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
2015-04-17 20:46:47 +00:00
John Reck
afbeb2c237 Merge "Revert "Remove Bitmap#getSkBitmap"" 2015-04-17 20:46:22 +00:00
John Reck
1ff961dd6d Revert "Remove Bitmap#getSkBitmap"
This reverts commit 4bd981ec53.

Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
2015-04-17 20:45:15 +00:00
Svet Ganov
16a1689950 Add OP_READ_PHONE_STATE app op - framework
The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
2015-04-17 20:43:56 +00:00
Eino-Ville Talvala
7b4e887390 Merge changes from topics 'add-depth-capability', 'add-highresolution-level'
* changes:
  Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
  Camera: Add HIGH_RESOLUTION hardware level.
2015-04-17 20:22:43 +00:00
Alan Viverette
65aea84c5a Merge "Move date picker arrows out of SimpleMonthView" 2015-04-17 18:16:19 +00:00
Eino-Ville Talvala
0b7b03b35f Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
- Define DEPTH_OUTPUT capability and its requirements.
- Add DEPTH_IS_EXCLUSIVE to support devices that cannot produce color and depth
  for the same capture.

Change-Id: I6e511b7b8625907d9fc751fe8a73a443edeeb2ab
2015-04-17 10:52:42 -07:00
Eino-Ville Talvala
86ea32a68c Camera: Add HIGH_RESOLUTION hardware level.
For camera devices that support very high resolutions, add
a level that allows for those resolutions to operate at lower
capture rates, while ensuring that a reasonable resolution is
still available for high-rate capture.

Change-Id: I4a0d904504ac8a976bd02fba89b238048d55a268
2015-04-17 10:52:41 -07:00
Alan Viverette
78bf1d329a Move date picker arrows out of SimpleMonthView
Also fixes incorrect docs in Drawable.

Bug: 20188255
Change-Id: I01c8563f734d9c1dad1e149bee80c651981e469f
2015-04-17 10:39:22 -07:00
Chris Craik
66b4139d6a Hide transient view API
bug:18621099

Change-Id: I25f64bc50bbbcf9fbbd8a4cdf81cacb61fa256f0
2015-04-17 10:09:05 -07: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
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
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
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
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00: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
Adam Lesinski
a4766050c5 Merge "Report WiFi and Bluetooth energy collection in checkin stats" 2015-04-17 01:54:19 +00: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
Adrian Roos
94e15a59b7 Allow dismissing Keyguard from TrustAgentService
Bug: 19900313
Change-Id: I44d13ee6fe65070327076e73a3ed96c94acdc108
2015-04-17 01:12:30 +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
Filip Gruszczynski
05636471fc Merge "Make UNSPECIFIED measure spec include size hint." 2015-04-17 00:03:22 +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
Adam Powell
54832cdb76 Merge "Clear ViewGroup nested scrolling axes when nested scrolling stops" 2015-04-16 22:58:39 +00:00
Jeff Brown
f647832bd4 Merge "Add support for disabling display scaling for development." 2015-04-16 22:55:58 +00:00
Adam Powell
d4a22d4edb Clear ViewGroup nested scrolling axes when nested scrolling stops
Bug 19517415

Change-Id: I3dc1c70d8894bd4478d7671c9dac2c9b17a45efa
2015-04-16 15:44:10 -07:00
Chad Brubaker
733ad46ad2 am 1ba95855: am a9d74000: am e5e49a17: Merge "Support KM_LONG_REP"
* commit '1ba9585506521a2bb722ef692dc7152291306898':
  Support KM_LONG_REP
2015-04-16 22:42:38 +00:00
Wale Ogunwale
2c1d9652fa Merge "Return more information when getAppTasks#getTaskInfo is called." 2015-04-16 22:36:54 +00:00
Wale Ogunwale
6041cc1a07 Merge "Added attribute showForAllUsers that deprecates showOnLockScreen" 2015-04-16 22:35:35 +00:00
Adam Powell
0fca5c13d3 Merge "Improve error reporting for buggy View subclasses" 2015-04-16 22:32:18 +00:00
Alex Klyubin
35075a0765 Merge "Document usesCleartextTraffic app-level attribute." 2015-04-16 22:28:06 +00:00
Chad Brubaker
a9d740003f am e5e49a17: Merge "Support KM_LONG_REP"
* commit 'e5e49a175c27b95d6b8928ab435bfde9f9db3c81':
  Support KM_LONG_REP
2015-04-16 22:23:29 +00:00
Filip Gruszczynski
4544b927d7 Hold a wake lock while dozing when wallpaper draws.
This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
2015-04-16 15:00:58 -07:00
Chad Brubaker
e5e49a175c Merge "Support KM_LONG_REP" 2015-04-16 21:56:13 +00:00
Adam Powell
82d3cd69b5 Improve error reporting for buggy View subclasses
When a view doesn't call setMeasuredDimension, note the view ID
and class name as part of the exception message.

Bug 18037248

Change-Id: I1c5ed823378ad92a067801dc8c3be31b07c6f463
2015-04-16 14:54:10 -07:00
Alan Viverette
df3139db33 Merge "D-pad should be able to push seek bar to 0 or max value" 2015-04-16 21:50:57 +00:00
Michael Wright
666b2b75ce Merge "Stop Shift+Backspace from foward deleting." 2015-04-16 21:46:14 +00:00
Andres Morales
f1f6aad891 Merge "Expose SID API" 2015-04-16 21:41:10 +00:00
Andres Morales
ca38add3ea Expose SID API
Change-Id: Ic8b56529353f759f58f687a7cb1b4655ffee8b6d
2015-04-16 14:40:33 -07:00
Chad Brubaker
b543b39354 Support KM_LONG_REP
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
2015-04-16 14:39:51 -07:00
Filip Gruszczynski
b6824bf58a Make UNSPECIFIED measure spec include size hint.
Change-Id: I6c4f193d0590824c644e20e8af16d055a04ac9c9
2015-04-16 14:39:13 -07:00
Roozbeh Pournader
83ab3b44df Merge "Fix various conformance issues with TextDirectionHeuristics." 2015-04-16 20:38:55 +00:00