152682 Commits

Author SHA1 Message Date
Deepanshu Gupta
6accdcd1d0 am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev
* commit '8d89d1e03d592561d9d8ef7a54e5697c47282b69':
  LayoutLib: support font weights.
2014-09-11 05:04:50 +00:00
Deepanshu Gupta
820ce63cea Merge "LayoutLib: support font weights." into lmp-dev 2014-09-11 04:54:26 +00:00
Jean-Michel Trivi
103e222137 am a20c82b9: am e5c53e9d: am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
* commit 'a20c82b9b13760a432f7122790516ec5742a4dbf':
  Do not restore the media button event receiver
2014-09-11 04:54:20 +00:00
Jean-Michel Trivi
58a8de3ff2 am e5c53e9d: am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
* commit 'e5c53e9d78eed94bd9ed55aabddf96e07c7b9a50':
  Do not restore the media button event receiver
2014-09-11 04:43:22 +00:00
Jean-Michel Trivi
e5c53e9d78 am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
* commit '4fa904aba2d60ca8bce39b30264076d8eec7a904':
  Do not restore the media button event receiver
2014-09-11 04:33:36 +00:00
Jean-Michel Trivi
4fa904aba2 am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
* commit '9513f81e33bc0da445735257c8de11a38f3775fa':
  Do not restore the media button event receiver
2014-09-11 04:23:21 +00:00
Jean-Michel Trivi
9513f81e33 am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
* commit '24499ba7ff79c8fa2ea9e02256366c43e78f66c0':
  Do not restore the media button event receiver
2014-09-11 04:16:10 +00:00
Ricardo Cervera
bed4639b97 am bb79fcb8: am 6c7bc371: am 4232a59b: am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit 'bb79fcb8142e9284836000a6486c1e0b4a6fdfc6':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
2014-09-11 03:47:47 +00:00
Ricardo Cervera
1a19bc4f0e am ce068304: am 4bb4d66c: am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs
* commit 'ce0683044dd457f32f74df578e77c1ca84cd1cfc':
  docs: Fixed minor bug in downloads class. Bug: 16948533
2014-09-11 03:47:42 +00:00
Ricardo Cervera
9595d159b2 am 6c7bc371: am 4232a59b: am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit '6c7bc3711f9e4b2b5a7cd88de26d063e3fff9b7f':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
2014-09-11 03:31:05 +00:00
Ricardo Cervera
8c3b5c0919 am 4bb4d66c: am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs
* commit '4bb4d66c0e8570cfd771853b71fdb1d8dbbede5d':
  docs: Fixed minor bug in downloads class. Bug: 16948533
2014-09-11 03:29:33 +00:00
Youngsang Cho
bb19f5965c am 4608b9d9: Fix build breakage
* commit '4608b9d908bcceb3b1c7207fffb61b9d509d2f4d':
  Fix build breakage
2014-09-11 02:41:48 +00:00
Youngsang Cho
db8f7ab752 Fix build breakage
Change-Id: Ic52e2d767f3adfedfa4e78aa2510d480c537c857
2014-09-11 11:22:07 +09:00
Terry Heo
fdfe7713c5 am 75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev
* commit '75cd6c5eb3e02101ddbb9fe21a641e312e5cc004':
  Add a system API to query hdmi system audio mode
2014-09-11 01:47:55 +00:00
Chulwoo Lee
b27c4240b0 am cacba761: Notify of the update of TvInputInfo
* commit 'cacba7615051b8667d5b2b178603ed78eb492e28':
  Notify of the update of TvInputInfo
2014-09-11 01:47:50 +00:00
Alan Viverette
a36b7c236e am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
* commit '515699a4a0235d8cd39fd586067e9d2857e6bda4':
  Use Calendar day of week rather than Time in SimpleMonthView
2014-09-11 01:38:54 +00:00
Svetoslav Ganov
f11a7097ad am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
  Using the correct package name for ContentResolver
2014-09-11 01:38:49 +00:00
Terry Heo
d608f3abac Merge "Add a system API to query hdmi system audio mode" into lmp-dev 2014-09-11 01:35:07 +00:00
Chulwoo Lee
19ba61affb Notify of the update of TvInputInfo
The TvInputInfo is updated when
1. the package is reinstalled.
2. the media on which a newer version of TV inputs exists become
   available.
3. the media on which a newer version of TV inputs exists become
   unavailable.

BUG: 17349383
Change-Id: I983058b13678bd8ecf7d766dc8bdac5fed7df4a0
2014-09-11 10:32:00 +09:00
Lajos Molnar
1f9a328f1c am c4c153a8: MediaCodec.Image: use image.setCrop() in constructor
* commit 'c4c153a8ec120e52453d01f580f81e4e43b35662':
  MediaCodec.Image: use image.setCrop() in constructor
2014-09-11 01:31:44 +00:00
Alan Viverette
0c1964e76d Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
f7ac65f353 am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev
* commit '022cfcda265079cc694079db43bd58efcbd4958a':
  Fix issue #17414533: update batterystats occasionally takes a couple...
2014-09-11 01:04:09 +00:00
Dianne Hackborn
d1006c346b am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
  Fix issue #17428001: Fix revokeUriPermissions
2014-09-11 01:04:02 +00:00
Lajos Molnar
eaaef6c0bf am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
  add android.util.SizeF.parseSizeF()
2014-09-11 01:03:51 +00:00
Lajos Molnar
b1644e156d MediaCodec.Image: use image.setCrop() in constructor
This avoids the ReadOnlyBuffer exception for readonly images.

Bug: 17059255
Change-Id: I83de487e8bf60ba09b1cba1c0106191dd741c217
2014-09-10 17:58:09 -07:00
Dianne Hackborn
023b6812ab Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 2014-09-11 00:56:41 +00:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Jean-Michel Trivi
24499ba7ff am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver
* commit 'e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
  Do not restore the media button event receiver
2014-09-11 00:51:32 +00:00
Adam Lesinski
b97d7ff8d8 am 5acd2166: Merge "Output recent configs in am get-config command" into lmp-dev
* commit '5acd2166edf0006270aeb3ee8c2e2e4d0699ee5a':
  Output recent configs in am get-config command
2014-09-11 00:29:39 +00:00
Alan Viverette
7c676aab9f am 2a94c34d: Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev
* commit '2a94c34d4e0daef9391a95b7081f26169006bddb':
  Copy opaque over shape in GradientDrawable copy constructor
2014-09-11 00:29:35 +00:00
Adam Lesinski
7172bdd77c Merge "Output recent configs in am get-config command" into lmp-dev 2014-09-11 00:24:05 +00:00
Alan Viverette
87610e535d Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev 2014-09-11 00:22:10 +00:00
Ricardo Cervera
6c7bc3711f am 4232a59b: am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit '4232a59b083f4062e127b4de4663348b3e08b1bd':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
2014-09-11 00:19:11 +00:00
Ricardo Cervera
4bb4d66c0e am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs
* commit '02afa7348b7b6b41d24f4d401d07ed3cea4b5066':
  docs: Fixed minor bug in downloads class. Bug: 16948533
2014-09-11 00:19:06 +00:00
Dianne Hackborn
652973fca8 Fix issue #17414533: update batterystats occasionally takes a couple...
...hundred milliseconds.

Rework the locking so that no critical paths block on the cpu collection.

Change-Id: Ie615a033f7f8b523b67abee62c581d1a8fce324c
2014-09-10 17:11:22 -07:00
Alan Viverette
5878076456 Use Calendar day of week rather than Time in SimpleMonthView
BUG: 17377360
Change-Id: I685f35b760c049edaa8934eccaf5ce1bbf326cf2
2014-09-10 17:09:13 -07:00
Ricardo Cervera
4232a59b08 am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit 'd086db30d0f097f34eae0a9a3d443e11cc230d62':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
2014-09-11 00:06:13 +00:00
Ricardo Cervera
02afa7348b am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs
* commit 'a6c12f0189c92b556fd7c3af3d8466d9b6d828c9':
  docs: Fixed minor bug in downloads class. Bug: 16948533
2014-09-11 00:06:10 +00:00
Deepanshu Gupta
145bc2d067 LayoutLib: support font weights.
Also fixes a shader delegate method.

Change-Id: I86be80ab55d04760084d5bf39235f2ee4de7be23
2014-09-10 17:01:16 -07:00
Ricardo Cervera
d086db30d0 Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 2014-09-10 23:57:47 +00:00
Ricardo Cervera
a6c12f0189 Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 2014-09-10 23:57:16 +00:00
Alan Viverette
c3a63c1fbb Copy opaque over shape in GradientDrawable copy constructor
BUG: 17433604
Change-Id: I8eeba8bd68930db178545a3b25e29c3c45ae1f79
2014-09-10 16:54:02 -07:00
Alan Viverette
db22bddf94 am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
* commit '78f863c7c00948817ede61ec59e47c990009b00d':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-10 23:39:02 +00:00
Alan Viverette
8dbfafd5fa am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
  Make SearchView styles public, remove public Holo styles added in L
2014-09-10 23:33:30 +00:00
Alan Viverette
730f9ca351 am 38669745: Merge "Only force drawing in RippleDrawable when necessary" into lmp-dev
* commit '38669745510256efb4372c498160d6a1e7d302f8':
  Only force drawing in RippleDrawable when necessary
2014-09-10 23:33:25 +00:00
Alan Viverette
593f2d33bb Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 2014-09-10 23:31:04 +00:00
Alan Viverette
7ff0270e7d Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 2014-09-10 23:29:13 +00:00
Chris Craik
fc6584f311 am 093e3412: Merge "Additional layer logging" into lmp-dev
* commit '093e341206df8a3d78e2f4b4247a5fbd68ef37f5':
  Additional layer logging
2014-09-10 23:28:49 +00:00