130394 Commits

Author SHA1 Message Date
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
2014-04-10 09:26:44 +00:00
Narayan Kamath
1d26a3f1ef am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs
2014-04-10 09:23:33 +00:00
Narayan Kamath
0fd40cb100 am 80413c9f: Merge "Re-implement native library search and copies."
* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.
2014-04-10 09:23:30 +00:00
Narayan Kamath
09e13cc5f9 Merge "System services detect and register app CPU ABIs" 2014-04-10 09:20:22 +00:00
Narayan Kamath
80413c9fe1 Merge "Re-implement native library search and copies." 2014-04-10 09:19:38 +00:00
Jessica Hummel
357ecd47f9 am e5e8444c: Merge "Allow setting the active admin across users."
* commit 'e5e8444ce864e7ac5d07308b9a5c5ca2caaa4e0a':
  Allow setting the active admin across users.
2014-04-10 08:42:18 +00:00
Jessica Hummel
e5e8444ce8 Merge "Allow setting the active admin across users." 2014-04-10 08:16:28 +00:00
Jessica Hummel
6d36b60beb Allow setting the active admin across users.
This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile.

Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400
2014-04-10 08:15:42 +00:00
Zhijun He
fe522bdeb6 am 9ce83761: Merge "Camera2: Add MANUAL capture intent"
* commit '9ce83761cc9908e6acad8af5ad45574163b28b19':
  Camera2: Add MANUAL capture intent
2014-04-10 02:13:15 +00:00
Zhijun He
9ce83761cc Merge "Camera2: Add MANUAL capture intent" 2014-04-10 02:07:37 +00:00
Zhijun He
e30adb762a Camera2: Add MANUAL capture intent
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
2014-04-09 19:04:31 -07:00
Zhihai Xu
13c630a695 am 7e6fe14f: am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '7e6fe14f0264cef4fa2e0e3bbe5ea26c9a211ec6':
  LE: Return false if an attribute read/write is in progress
2014-04-10 01:14:21 +00:00
Jesse Gunsch
0acae4034c am ece41093: am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit 'ece410939fbb7a463c79ea63adf3b96c12dc386e':
  Merge "NsdService does not clean up after exiting clients"
2014-04-10 01:14:18 +00:00
Zhihai Xu
7e6fe14f02 am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '544991946287bdd3a9e6a71855642e378594bf73':
  LE: Return false if an attribute read/write is in progress
2014-04-10 01:07:26 +00:00
Jesse Gunsch
ece410939f am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '3c1c137579783fad81169da01d5c7c5819c81b07':
  Merge "NsdService does not clean up after exiting clients"
2014-04-10 01:07:23 +00:00
John Reck
b8c0f774db am 9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree"
* commit '9817ddd420aaa885f92f778ae2cfd17e6a71bc87':
  Merge hasFunctors & pushStaging into prepareTree
2014-04-10 00:18:15 +00:00
John Reck
9817ddd420 Merge "Merge hasFunctors & pushStaging into prepareTree" 2014-04-10 00:14:10 +00:00
Deepanshu Gupta
ddb31bf2c9 am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib"
* commit '8aa7a9677af8f235ade204602014a5e2e9f9188e':
  Support custom views using TimePickerDialog in layoutlib
2014-04-10 00:06:34 +00:00
Alan Viverette
9ddf8ef184 am 5062649a: Merge "Update list item text appearance"
* commit '5062649abac9bf873123fe560fbb7b0748b30a54':
  Update list item text appearance
2014-04-10 00:00:48 +00:00
John Reck
f4198b713e Merge hasFunctors & pushStaging into prepareTree
Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
2014-04-09 17:00:04 -07:00
Deepanshu Gupta
8aa7a9677a Merge "Support custom views using TimePickerDialog in layoutlib" 2014-04-09 23:59:26 +00:00
Jeff Brown
908fae826b am 30439d62: am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
* commit '30439d62d28d1368b68c59e77fb1bcf6be1d8fbe':
2014-04-09 23:56:44 +00:00
Winson Chung
51b6daf6b0 am 2835db8b: Merge "Removing duplicated code in Recents"
* commit '2835db8b62ec8cb15369a96da6d7b97122d395fb':
  Removing duplicated code in Recents
2014-04-09 23:56:41 +00:00
Winson Chung
bdcf525a89 am 2adb9586: Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view."
* commit '2adb95860f9682ed2c4893da58679540cd8cac56':
  Allow for different rects when animating to a single task stack view and a multiple task stack view.
2014-04-09 23:56:37 +00:00
Alan Viverette
5062649aba Merge "Update list item text appearance" 2014-04-09 23:54:24 +00:00
Alan Viverette
55565ecd46 Update list item text appearance
Adds a new attribute for secondary list item text and points
the Gingerbread and Holo themes to use TextAppearance.Small for
compatibility's sake.

Change-Id: I8e78a908b699baae6d1f5b3623fd7b5648b99b77
2014-04-09 16:52:54 -07:00
Svetoslav
34d233dd48 am bc1a8f42: Merge "Active window not correctly computed."
* commit 'bc1a8f42d9eb5f1d91c872904a9a283781291fcb':
  Active window not correctly computed.
2014-04-09 23:52:14 +00:00
Jeff Brown
30439d62d2 am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
* commit '6fdb5e6df178b3b1062ac67b505b288aa609a66b':
2014-04-09 23:50:47 +00:00
Zhihai Xu
5449919462 am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '2e8a2d207f446e156a8cfb9532cdfb569caa9458':
  LE: Return false if an attribute read/write is in progress
2014-04-09 23:50:39 +00:00
Winson Chung
2835db8b62 Merge "Removing duplicated code in Recents" 2014-04-09 23:50:39 +00:00
Jesse Gunsch
3c1c137579 am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '8d31358fb4f0f948fcfd07399d4247375dc5eea9':
  Merge "NsdService does not clean up after exiting clients"
2014-04-09 23:50:35 +00:00
Winson Chung
2adb95860f Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view." 2014-04-09 23:50:33 +00:00
Svetoslav
bc1a8f42d9 Merge "Active window not correctly computed." 2014-04-09 23:48:41 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
2014-04-09 16:47:40 -07:00
Svetoslav
48eacec53e Active window not correctly computed.
The accessibility manager service was not handling the focused
window properly which as a result was breaking the active window
tracking.

bug:13788022

Change-Id: Iaa3fadfbf7b9545f5151e3603beeda2662fe7618
2014-04-09 16:45:49 -07:00
John Reck
c8334289f5 am 8e1f9187: Merge "Switch DisplayListData to a staging model"
* commit '8e1f918738abf70a4dc86dbb12b386a9deea37f8':
  Switch DisplayListData to a staging model
2014-04-09 23:06:00 +00:00
John Reck
8e1f918738 Merge "Switch DisplayListData to a staging model" 2014-04-09 23:01:02 +00:00
John Reck
8de65a8e05 Switch DisplayListData to a staging model
Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
2014-04-09 15:48:00 -07:00
Winson Chung
b44c24fb50 Removing duplicated code in Recents
- Also disabling the animation on the first task view when animating from home
- Fixing a case where filtered and non-filtered state can be exactly the same

Change-Id: I01665391fc0b0745a89e404b12280d3d919aec83
2014-04-09 15:19:57 -07:00
Deepanshu Gupta
86e5218220 Support custom views using TimePickerDialog in layoutlib
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
2014-04-09 15:15:49 -07:00
ztenghui
33ed52eff4 Fix path interpretation on curves
Mostly about the shorthand for quadratic / cubic curve.

We now comply with the spec, which said the behavior should depend on the
previous command.
At the same time, make sure our current point and current control point info
are always in absolute coordinates, not a mix of absolute and relative.
CTS test will be added to monitor this behavior.

Note: Chrome / Firefox are following this rule, while Linux OS / Batik are not.

bug:13913405

Change-Id: I9f8168ed97f87c754c79588984f1f199507b0377
2014-04-09 15:11:40 -07:00
John Spurlock
50ee51d955 am 3c86a27d: Merge "Put suppressed notifications behind a summary notification."
* commit '3c86a27d3e9044d04d0f176e59a1ebbcd774a54c':
  Put suppressed notifications behind a summary notification.
2014-04-09 21:49:27 +00:00
John Spurlock
3c86a27d3e Merge "Put suppressed notifications behind a summary notification." 2014-04-09 21:45:36 +00:00
Winson Chung
0d767551c5 Allow for different rects when animating to a single task stack view and a multiple task stack view.
- Fixing regression in task bar enter animation duration
- Fixing issue with extra long titles in the task bar
- Cleaning up some constants and unused code
2014-04-09 14:33:23 -07:00
John Spurlock
bf20eab6fc Put suppressed notifications behind a summary notification.
Bug:13726563
Change-Id: Ib1c3fba3a328792dc674c8403735f75d4db41973
2014-04-09 16:52:20 -04:00
Alan Viverette
f7dd84ee48 am 03bdcfa5: Merge "Ensure theme attributes are set appropriately"
* commit '03bdcfa519766ffe9d331d176eae8c77452bc4ff':
  Ensure theme attributes are set appropriately
2014-04-09 20:43:57 +00:00
Alan Viverette
03bdcfa519 Merge "Ensure theme attributes are set appropriately" 2014-04-09 20:37:20 +00:00
Fabrice Di Meglio
3654de0b02 am 03fee276: Merge "Update SearchIndexablesContract"
* commit '03fee27646564cf1b559b7f8a53d35a1db18d0bd':
  Update SearchIndexablesContract
2014-04-09 20:33:56 +00:00