51303 Commits

Author SHA1 Message Date
Alan Viverette
1a0c96696e Merge "Ensure volume preference has correct defStyleAttr" 2014-05-15 22:13:36 +00:00
Adam Powell
76d8f96805 Add content insets to Toolbar
Content insets allow a Toolbar to define horizontal gridlines for the
start/end or left/right edges of major content (not counting the
navigation button or menu). This allows apps to align their layout
content above or below a Toolbar with the title and other contents of
the bar by using app-defined measurements.

Change-Id: Ibd7e0810bf81070eb5f59a42ad3257f35bc0156a
2014-05-15 15:11:40 -07:00
Alan Viverette
fcb48b3ab9 Ensure volume preference has correct defStyleAttr
BUG: 14635756
Change-Id: Id78da5df3d355a4dda9bd1b80b14df54803d5d03
2014-05-15 15:03:36 -07:00
Dianne Hackborn
0a3103e755 Merge "Battery stats more wake history, power save mode." 2014-05-15 21:57:27 +00:00
Paul McLean
c5d0cd895b Merge "Changed namespace of AlsaParser (and components) to correctly reflect their place in the directory hierarchy." 2014-05-15 21:02:49 +00:00
Alan Viverette
1dfa9d98be Merge "Simplify attribute extraction for themed Drawables" 2014-05-15 20:58:59 +00:00
Adrian Roos
e78e6f9237 Merge "Colorize SystemUI" 2014-05-15 20:39:17 +00:00
Adrian Roos
e71c2af2a1 Merge "Add System UI Color API" 2014-05-15 20:37:50 +00:00
Dianne Hackborn
cbefd8dd2b Battery stats more wake history, power save mode.
Add new option for battery stats to record the full wake
lock history, and recording the current power save mode.

Also add in some additional error constants when generating
Binder error exceptions.

And fix issue #14974572: Avoid repeating wakeup_reason at
the beginning of history

Change-Id: I7c1a2ab9569de216634f63d8ad69f1294ef1d235
2014-05-15 13:32:29 -07:00
Paul McLean
65a30ab519 Changed namespace of AlsaParser (and components) to correctly reflect their place
in the directory hierarchy.

Change-Id: I33a5a34a31d5811cfb5167843dc185ba94d236fd
2014-05-15 13:22:37 -07:00
Svetoslav
dbef65f1a1 Merge "Adding APIs to render PDF documents." 2014-05-15 20:15:06 +00:00
John Reck
a3d5d3ca11 Merge "Animator start value..." 2014-05-15 20:10:52 +00:00
Raph Levien
d4bac5eab6 Merge "Remove SkFloatToScalar in GLES20Canvas (Minikin)" 2014-05-15 19:12:48 +00:00
Svetoslav Ganov
177cf2155d Merge "Adding custom events to AccessibilityNodeInfo" 2014-05-15 17:51:46 +00:00
Kristian Monsen
74bc194765 Adding custom events to AccessibilityNodeInfo
Change-Id: Id7a1985d1a6c4a9f7153f6d4d7e45f80c8d2b2b0
2014-05-15 10:50:59 -07:00
Prerepa Viswanadham
63da5bf55e Improve name of api.
Change-Id: I4db24db621ab746f5e5efcbaf87b8856cf234e3e
2014-05-15 17:37:38 +00:00
Prerepa Viswanadham
01c92da4c9 set scan parameters in BT stack. Apply the most demanding request
in terms of duty cycle for all outstanding requests.Add api to set scan parameters.

Change-Id: Iee460003d210455ab180367f3518bfb10a6c2539
2014-05-15 17:37:24 +00:00
Justin Koh
6abab04c99 am 8b2e7c4a: am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
* commit '8b2e7c4aaa1198a0a2d4fe1effd03f889e5d3130':
  If there is only 1 simple global action, autolaunch it
2014-05-15 17:23:55 +00:00
Justin Koh
8b2e7c4aaa am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
* commit '0ade263c28ea62e619972752ef2e6a6c994eeddf':
  If there is only 1 simple global action, autolaunch it
2014-05-15 17:20:23 +00:00
Justin Koh
0ade263c28 Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev 2014-05-15 17:17:14 +00:00
Raph Levien
d93ef91861 Remove SkFloatToScalar in GLES20Canvas (Minikin)
A recent Skia change removed the SkFloatToScalar macro, but it was being
used in the Minikin case for the GSES20Canvas (enabled only on
USE_MINIKIN builds). This patch removes it.

Change-Id: Ib64fd347f5db94fa6f3b3f79957d55a38f0328c9
2014-05-15 09:54:01 -07:00
Igor Murashkin
25f9a3cd27 Merge "camera2: Use StreamConfigurationMap for format/size/duration lookup" 2014-05-15 16:51:26 +00:00
Adrian Roos
ea56251d92 Colorize SystemUI
Makes the color of the status and navigation bars customizable by
the app.

Bug: 14564488
Change-Id: I036edc228cfe1b659c7f11a43cdc4598ee705ff8
2014-05-15 18:22:37 +02:00
Adrian Roos
217ccd2f82 Add System UI Color API
Bug: 14564488
Change-Id: Ibebe87faeb1b730f9ac33bb5074a7b4f71b9d1c7
2014-05-15 18:22:37 +02:00
John Reck
ff941dcd81 Animator start value...
Change-Id: Ifd35ed95a28c625086d7fa97764fe63ab4a997f1
2014-05-15 08:53:39 -07:00
George Mount
45bbc06c7c Merge "Support Activity Transitions when activity stopped." 2014-05-15 14:49:56 +00:00
George Mount
e2337588f0 Merge "Allow changing order of matching Views in Transitions." 2014-05-15 14:49:31 +00:00
Leon Scroggins
95f7b135ce Merge "Frameworks changes to support latest Skia (r14729)" 2014-05-15 14:40:45 +00:00
Baligh Uddin
7969abb448 Merge "Import translations. DO NOT MERGE" 2014-05-15 14:26:00 +00:00
Mike Reed
4c9355c35a Frameworks changes to support latest Skia (r14729)
Required for a merge in external/skia
(I88b4d5cc81c357a8e223bd7860b1029590265200).

Includes two cherry-picks:

I456df543e1925b280f785c7b3bb81370157f9b09:
replace SkRasterizer* with NativeRasterizer* in JNI

I98adb200e023369d3ee75f21927fa98f23095a77:
Fix Paint.getFlags,setFlags wrt FILTER_BITMAP_FLAG

In Paint.setFlags(), turn FILTER_BITMAP_FLAG into a call to
SkPaint::setFilterLevel().

In Paint.getFlags(), read SkPaint::getFilterLevel() to determine
whether to include FILTER_BITMAP_FLAG in the result.

Fixes CTS tests with ToT Skia.

Change-Id: I2736f3f68683651574d79a169ff0ab563e0a469e
2014-05-15 10:17:44 -04:00
George Mount
62ab9b78b7 Support Activity Transitions when activity stopped.
Bug 14459812
Bug 14454812
Bug 14450295

A new transport was supported for Activity Transitions
in which convertToTranslucent can now take a Bundle
to transport to the calling Activity. This also allows
waking Activities to regain the communication between
the exiting Activity and the calling Activity.

Change-Id: I29aee14b7e56d9b8b9fb656f382b2c4172b02e14
2014-05-15 07:11:48 -07:00
Narayan Kamath
27a964b54d am 35b884f8: am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '35b884f88e39c97056e71f329e73812a142103b5':
  Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:44:46 +00:00
Narayan Kamath
35b884f88e am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit 'be3dc5754fd081f54a86df9894763c0da915eed3':
  Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:41:12 +00:00
Narayan Kamath
be3dc5754f am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '402120a2236b294dff9a51461cb22400a6ef67f6':
  Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:38:17 +00:00
Narayan Kamath
402120a223 Merge "Wait for secondary zygote before bringing up the system_server." 2014-05-15 13:34:09 +00:00
Narayan Kamath
5d5f19a339 am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '6e2e686889037711170ee145f9dfdb442cee85db':
  Remove "required" prefix from ABI fields.
2014-05-15 12:45:27 +00:00
Narayan Kamath
6e2e686889 am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
  Remove "required" prefix from ABI fields.
2014-05-15 12:41:47 +00:00
Narayan Kamath
706b1d7ea0 Merge "Remove "required" prefix from ABI fields." 2014-05-15 12:39:36 +00:00
Narayan Kamath
6e35a2ad05 Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.

(cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047)

Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
2014-05-15 10:57:05 +01:00
Narayan Kamath
1e74c37f8e Merge "Remove "required" prefix from ABI fields." 2014-05-15 09:42:45 +00:00
Yohann Roussel
4d80621476 Merge "Test multidex and annotations access." 2014-05-15 09:14:47 +00:00
Yohei Yukawa
ed1a18f40f Merge "Make a copy of Matrix in CursorAnchorInfoBuilder" 2014-05-15 07:30:00 +00:00
Yohei Yukawa
419b1b0498 Make a copy of Matrix in CursorAnchorInfoBuilder
This CL fixes a bug that CursorAnchorInfoBuilder does't make a
copy if the Matrix specified with #setMatrix.

Without this fix, IMM#updateCursorAnchorInfo could fail to detect
duplicated events when the same instances of
CursorAnchorInfoBuilder and Matrix are reused to optimize
performance.

Change-Id: I50c50a12a06d3cda4dec445b171b61ceb78da21a
2014-05-15 16:10:04 +09:00
Alan Viverette
fc2cf830b0 Add working DarkActionBar theme, fix DeviceDefault action bar
Change-Id: I3a1542acd8ed04382477821659c926938d0b039f
2014-05-14 20:05:39 -07:00
Jeff Sharkey
71234f1441 Merge "Binder interfaces mean we can't use @PrivateApi." 2014-05-15 02:21:14 +00:00
Jeff Sharkey
8b0cfb7dbd Binder interfaces mean we can't use @PrivateApi.
Change-Id: Ie6d516b9ef8b7874160634b3b7b70d19481d1605
2014-05-14 19:19:11 -07:00
Raph Levien
1044a8211d Merge "BiDi support for Minikin" 2014-05-15 02:11:48 +00:00
Raph Levien
9e2b288ba8 Merge "Proper refcounting for Minikin objects" 2014-05-15 02:03:48 +00:00
Raph Levien
018646adac Merge "Parsing of XML font configuration files for Minikin" 2014-05-15 02:03:34 +00:00
Raph Levien
2836c4722a Merge "Start of Minikin integration" 2014-05-15 02:03:05 +00:00