Deepanshu Gupta
fa3c665019
am 71518174: Merge "Fix project settings." into lmp-mr1-dev
...
* commit '71518174fcd57c85d1e38f1794c44b763baff286':
Fix project settings.
2015-03-12 00:39:21 +00:00
Deepanshu Gupta
338a5a88fe
am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
...
* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
Add RecyclerView support.
2015-03-12 00:39:16 +00:00
Deepanshu Gupta
efc09c644f
am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
...
* commit '78660423900fa255cc83b85320e98d5184be393b':
Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:38:45 +00:00
Rich Slogar
7256fb4fdd
am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit 'a6b0ddb7f1437d67538364f16dedb61f7966c653':
docs: build image updates
2015-03-12 00:38:38 +00:00
Rich Slogar
a6b0ddb7f1
Merge "docs: build image updates" into lmp-docs
2015-03-12 00:34:10 +00:00
Deepanshu Gupta
7866042390
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
2015-03-12 00:32:55 +00:00
Deepanshu Gupta
b3cfb33489
Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
2015-03-12 00:32:32 +00:00
Deepanshu Gupta
71518174fc
Merge "Fix project settings." into lmp-mr1-dev
2015-03-12 00:31:54 +00:00
Deepanshu Gupta
b171be1a54
Merge "Add RecyclerView support." into lmp-mr1-dev
2015-03-12 00:31:50 +00:00
Deepanshu Gupta
0412b317ac
Tools attribute improvements for RecyclerView LayoutManager.
...
1. Change tools attribute for layout manager from layoutManagerType to
LayoutManager.
2. Support classnames in the tools attribute.
This change doesn't try to supprt arbitrary classnames for now. The
reason for this is that the new layoutlib API is supposed to contain a
new method for inflating custom classes that are not views. This will
allow us to throw better error messages. Without the new API, trying for
different constructors, will result in a error messages being logged.
Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
2015-03-11 17:26:48 -07:00
Deepanshu Gupta
5521f65ecb
Fix cyclic dependency in BlendComposite and BlendingMode.
...
Introduced in commit 1a10ca7e52
Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
2015-03-11 17:04:21 -07:00
Quddus Chong
d93f4c8bef
am 0d258a93: am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
...
* commit '0d258a93ad6cee573081e2060806c95524474de5':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:57:40 +00:00
Quddus Chong
0d258a93ad
am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
...
* commit '737d3cc07996aec1a2f264d242e016a4ccbc4857':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:47:54 +00:00
Quddus Chong
737d3cc079
am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
...
* commit '77eb85e14fb37a67af2eaf120e1c866dee64ad2c':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:42:06 +00:00
Rich Slogar
5fe44955cf
docs: remove studio proguard settings from play services
...
b/19641719
Change-Id: Id3d9e2db10fc5264b11f41a8359dc05511af7634
2015-03-11 16:37:39 -07:00
Quddus Chong
77eb85e14f
am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
...
* commit 'c706a980e426ea0e0b6aaee5530516b1a16c3755':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:30:58 +00:00
Quddus Chong
c706a980e4
am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
...
* commit 'a236a49edec87cd24fe683550c0ab83be3dcbf07':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:24:37 +00:00
Andreas Gampe
26c95085b3
am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"
...
* commit 'cdd3fb5cdb9be8ae087c6d0fef2a545fca1c4205':
Extracted a separate class to run dexopt on packages
2015-03-11 23:23:06 +00:00
Quddus Chong
a236a49ede
am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
...
* commit '47426f1c190b17548eabb50fad3945844f1a7363':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:16:59 +00:00
Quddus Chong
47426f1c19
Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
2015-03-11 23:11:03 +00:00
Andreas Gampe
cdd3fb5cdb
Merge "Extracted a separate class to run dexopt on packages"
2015-03-11 23:08:34 +00:00
Quddus Chong
489218c3ed
docs: Added overview page and Javadocs for the Android Testing Support Library.
...
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
2015-03-11 16:08:24 -07:00
Fyodor Kupolov
7487657ee9
Extracted a separate class to run dexopt on packages
...
performDexOptLibsLI and related methods were extracted to PackageDexOptimizer
class. Minor refactoring of PackageManagerService.
This is a non-functional change. It should simplify further work to allow
storing OAT files inside package dir.
(cherry picked from commit eeea67b8c3 )
Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
2015-03-11 16:03:41 -07:00
Deepanshu Gupta
85d72c4535
Fix rare NPE in BridgeContext.
...
Also fixed some deprecation warnings.
Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
2015-03-11 15:56:30 -07:00
Jason Sams
bb8c910fc1
am d2e4a166: Merge "Remove dead path code"
...
* commit 'd2e4a166ebae4dcf0a9d6cb186283739443b0803':
Remove dead path code
2015-03-11 21:06:53 +00:00
Jason Sams
d2e4a166eb
Merge "Remove dead path code"
2015-03-11 20:55:08 +00:00
Luan Nguyen
6c881ec9d5
am 872a731e: am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
...
* commit '872a731e596810bb5040553f16c3965c47ed9518':
Revert "docs: Update auto landing and design page image assets"
2015-03-11 19:30:38 +00:00
Luan Nguyen
872a731e59
am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
...
* commit 'a0f20621f1943dfc545e1c2cee3ed6b9c321f61b':
Revert "docs: Update auto landing and design page image assets"
2015-03-11 19:19:31 +00:00
Luan Nguyen
a0f20621f1
am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
...
* commit 'dd7d025b97aa09723f1695f23b85d1d926cb7ea1':
Revert "docs: Update auto landing and design page image assets"
2015-03-11 19:12:53 +00:00
Luan Nguyen
dd7d025b97
am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
...
* commit 'ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec':
Revert "docs: Update auto landing and design page image assets"
2015-03-11 19:07:52 +00:00
Marco Nelissen
42f55d1e68
am a3d25d74: Merge "Fix context leak"
...
* commit 'a3d25d7489d7e071fb6db01b62ec9d925e1d493d':
Fix context leak
2015-03-11 18:21:24 +00:00
Marco Nelissen
a3d25d7489
Merge "Fix context leak"
2015-03-11 18:10:05 +00:00
Jason Sams
a7e2509d8d
Remove dead path code
...
This API was never shipped and the implementation
never finished.
Change-Id: I2491db216d6a7a8ea30628d791773f89da5fb4d2
2015-03-11 11:00:00 -07:00
Luan Nguyen
3df87baca9
am 5228d083: am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
...
* commit '5228d0832a6c1a12fd789c28bb591b6642f55b5e':
docs: Update auto landing and design page image assets
2015-03-11 17:53:39 +00:00
Rich Slogar
964b401849
am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
...
* commit '40055c220fd77d1d2160e151e0993419772ba444':
docs: eclipse revisions update
2015-03-11 17:53:32 +00:00
Andrew Solovay
fd9d8c7bcb
am e5fd6c76: am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
...
* commit 'e5fd6c76a451700aaf34a6fc587f7d8855ada6e8':
docs: Revisions to "Providing Messaging for Auto"
2015-03-11 17:53:26 +00:00
Luan Nguyen
5228d0832a
am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
...
* commit '0c3282b5d2f491bfb0ca6b5cda62864d0b42bba7':
docs: Update auto landing and design page image assets
2015-03-11 17:42:58 +00:00
Rich Slogar
40055c220f
am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
...
* commit '11558e5d2259a48604f494c540df72de34977ce5':
docs: eclipse revisions update
2015-03-11 17:42:54 +00:00
Andrew Solovay
e5fd6c76a4
am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
...
* commit '3d950de4d4028e0c7763932c00c372d41c832e87':
docs: Revisions to "Providing Messaging for Auto"
2015-03-11 17:42:50 +00:00
Luan Nguyen
0c3282b5d2
am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
...
* commit '50a9b83554decb4913fc8eac9862edf902149265':
docs: Update auto landing and design page image assets
2015-03-11 17:32:01 +00:00
Rich Slogar
11558e5d22
am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
...
* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
docs: eclipse revisions update
2015-03-11 17:31:57 +00:00
Andrew Solovay
3d950de4d4
am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
...
* commit 'a493c48989f3c80dd061b86a6216a622b20dfc7f':
docs: Revisions to "Providing Messaging for Auto"
2015-03-11 17:31:53 +00:00
Prashant Malani
276d1bc929
am a98c21a6: Make circular mask thickness configurable
...
* commit 'a98c21a662040a8afa75a35bd882c292f7ed8414':
Make circular mask thickness configurable
2015-03-11 17:24:54 +00:00
Justin Koh
e011eb4ff9
am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev
...
* commit 'dff0fdb4172a230e4faff7ed93842c21a2d57335':
Add translatable=false to dozeComponent
2015-03-11 17:23:34 +00:00
Luan Nguyen
50a9b83554
am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
...
* commit '42ee70aac023da26a6dc4dee5856871372e792e8':
docs: Update auto landing and design page image assets
2015-03-11 17:18:43 +00:00
Rich Slogar
8ab872dba1
am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
...
* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
docs: eclipse revisions update
2015-03-11 17:18:39 +00:00
Andrew Solovay
a493c48989
am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
...
* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
docs: Revisions to "Providing Messaging for Auto"
2015-03-11 17:18:23 +00:00
Marco Nelissen
926ebb860a
Fix context leak
...
Using an activity context with AudioManager could cause that context
to be held on to longer than desired, for example if the caller
acquired audio focus but never abandoned it. Fix acquire/abandon in
VideoView, and use the application context in AudioManager to mitigate
the issue for other misbehaving code.
Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I0fb8390207422c784800dda25b1f2c03d4574bcd
2015-03-11 10:00:28 -07:00
Luan Nguyen
ca0db1a0ec
am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
...
* commit 'eeb79d104fc09ea727108bde7a7ef06f3300241a':
Revert "docs: Update auto landing and design page image assets"
2015-03-11 16:42:52 +00:00
Luan Nguyen
eeb79d104f
am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
...
* commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
Revert "docs: Update auto landing and design page image assets"
2015-03-11 16:35:32 +00:00