Terry Heo
f82890263f
am 4d85b87c: Merge "Add a frame capture API of TV input" into lmp-dev
...
* commit '4d85b87c91fe3cd39f052a2cb4fdbebbdf5eddcb':
Add a frame capture API of TV input
2014-07-24 01:35:48 +00:00
Winson Chung
d36795ea11
am a6335dad: Merge "Adding fallback transition for animating in/out of affiliate groups." into lmp-dev
...
* commit 'a6335dad8ba470bb142b7270e2fe3786e3cd67c0':
Adding fallback transition for animating in/out of affiliate groups.
2014-07-24 01:26:51 +00:00
Svetoslav
7d8e9af272
am 51bc2b53: Updating the save to PDF button icon.
...
* commit '51bc2b53f8edba1928c38ece83d1a06030761582':
Updating the save to PDF button icon.
2014-07-24 01:26:48 +00:00
Svetoslav
f8ffa567b5
Updating the save to PDF button icon.
...
Change-Id: Ie62a22d6e16d15426f10afa0512b0083c52ff507
2014-07-24 01:23:16 +00:00
Joe Onorato
aed505e725
am 3392ede6: Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
...
* commit '3392ede6681784f5416d09b012194496c9013028':
Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
2014-07-24 01:08:45 +00:00
Joe Onorato
69b078599b
Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
...
Change-Id: Ibcaee3f0f8d9ba14f1b002df9c6d4594c6278045
2014-07-23 17:56:57 -07:00
Joe Onorato
647a8458f4
am fc3576bf: s/MediaBrowseService/MediaBrowserService/
...
* commit 'fc3576bf840827bcf6c373e2f6dd05ba3738115a':
s/MediaBrowseService/MediaBrowserService/
2014-07-24 00:49:45 +00:00
Joe Onorato
77bfc8f228
s/MediaBrowseService/MediaBrowserService/
...
Change-Id: Ie07308739cdf94796a900e15527616608e02a3d4
2014-07-24 00:45:56 +00:00
ram
3f67998eb0
am 78609909: IMS: getPCSCF() API enhanced to support multiple APN types.
...
* commit '78609909c31d0dc7febaa707ca67b31f98b8c508':
IMS: getPCSCF() API enhanced to support multiple APN types.
2014-07-24 00:44:35 +00:00
Alan Viverette
3ac8ad270a
am 69c11987: Merge "Make lighting style and attribute public" into lmp-dev
...
* commit '69c11987af933d4f731b707e3d46b207b4e11f0b':
Make lighting style and attribute public
2014-07-24 00:44:30 +00:00
ram
e647099e14
IMS: getPCSCF() API enhanced to support multiple APN types.
...
Change-Id: I014f341b93a9ea7280e04cdfc13418fe81c9fc8b
Signed-off-by: ram <ram.pl@samsung.com>
2014-07-24 00:41:00 +00:00
Geoffrey Borggaard
080905ce6e
am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev
...
* commit 'd07b648b195b5022c45c38d8eaae93bafd177d87':
Fixes setting password through DevicePolicyManager
2014-07-24 00:28:40 +00:00
Prashant Malani
a04ea61db5
Revert "Remove circular mask"
...
This reverts commit 2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.
It also makes the circularMask option configurable via overlay.
It is set to false by default.
An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.
Bug: 16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e
2014-07-23 17:26:08 -07:00
Nancy Chen
13cddc6a86
am ef60a1ff: Merge "Hide multiple-account information if there is only a single account" into lmp-dev
...
* commit 'ef60a1ffaecb30a4c81cf5d73b233559b2c85e90':
Hide multiple-account information if there is only a single account
2014-07-23 23:51:22 +00:00
Ricardo Cervera
0f1e067a28
am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
...
* commit '472e234d807df490124263c1e28c66e1918787c9':
docs: Fixed RecyclerView example. Bug: 16483811
2014-07-23 23:12:15 +00:00
Ricardo Cervera
472e234d80
am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
...
* commit '7af4e812d06d7174e9eb677a508c6af0f3ba3608':
docs: Fixed RecyclerView example. Bug: 16483811
2014-07-23 23:08:10 +00:00
Ricardo Cervera
7af4e812d0
docs: Fixed RecyclerView example. Bug: 16483811
...
Change-Id: I1c501c97026dfaaac88d7398160ff192fee4fb05
2014-07-23 15:56:10 -07:00
vandwalle
e32bef58f9
Merge "autojoin fixes:" into lmp-dev
2014-07-23 22:56:04 +00:00
vandwalle
154b2cf6bb
autojoin fixes:
...
- make use of network scorer for autojoin
- Bug:16484607
Change-Id: Ib26cfe31aa5646facf781a2345981e06a6fc36e3
2014-07-23 18:11:26 -07:00
Matthew Williams
804d0d8f1e
am 0e61a7c0: Merge "Fix JobScheduler race condition" into lmp-dev
...
* commit '0e61a7c08fe3b74ea25db6a1ac6007d8545da1ab':
Fix JobScheduler race condition
2014-07-23 22:48:38 +00:00
Shishir Agrawal
02f6f36df0
am 27656cae: Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi
...
* commit '27656cae8f9b83811c7cba518a67e4fa4d65fcdb':
Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi
2014-07-23 22:36:57 +00:00
John Reck
d6352369f9
am ca66e06b: Dump RenderThread stack on unresponsive
...
* commit 'ca66e06b9db6e6c921662886e4b7ddd02ac92280':
Dump RenderThread stack on unresponsive
2014-07-23 22:32:36 +00:00
Shishir Agrawal
63c4c06be4
Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi
...
It will be required by setup wizard to delegate initialization to the carrier
app.
Change-Id: Icc0fc728e1e24235632ac38a482b06a7b829de78
2014-07-23 15:29:50 -07:00
John Reck
73b7a4db41
Dump RenderThread stack on unresponsive
...
Bug: 16408405
Change-Id: I4ba4836fd1451fb8ba77c34cdb843d3cb4217bb8
2014-07-23 22:28:44 +00:00
Winson Chung
b2cb18f084
am 96af21df: am 86bb7f0a: Merge "Fixing issue with the lock-to-app setting not being refreshed when entering recents." into lmp-dev
...
* commit '96af21dfc601abbf5087efe1da2ae4f51eae0fad':
Fixing issue with the lock-to-app setting not being refreshed when entering recents.
2014-07-23 22:04:38 +00:00
Winson Chung
72615fda0c
am 86bb7f0a: Merge "Fixing issue with the lock-to-app setting not being refreshed when entering recents." into lmp-dev
...
* commit '86bb7f0a30f608dfd9fb39345f061a1dda890f70':
Fixing issue with the lock-to-app setting not being refreshed when entering recents.
2014-07-23 21:59:08 +00:00
ztenghui
b3d6bd21c8
am b3067e74: am 69e50375: Add negative sign separation support in the pathData
...
* commit 'b3067e74831c423ac66a19d268831def94f8e6c3':
Add negative sign separation support in the pathData
2014-07-23 21:55:56 +00:00
Alan Viverette
815382c8b6
am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev
...
* commit '014089cd92401236b160c0f3384b430c1f610e34':
Use activity for brightness dialog
2014-07-23 21:55:50 +00:00
destradaa
7c469f1aec
am 32acd391: am 87a50e32: Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev
...
* commit '32acd391035535ccec902458befd5353e7d1ec4b':
Expose Gps Navigation Messages in the platform. b/16405976
2014-07-23 21:55:38 +00:00
John Spurlock
fe13fa6d76
am 6117200c: am 0ee346e7: Doze: Manage screen state + brightness when teasing.
...
* commit '6117200cc4ff342e13bb9d1487dad9a2b787dbf1':
Doze: Manage screen state + brightness when teasing.
2014-07-23 21:55:32 +00:00
RoboErik
ddf612436f
am f8f71ad7: am a9faa459: Merge "Change "Media output" to "Cast" for MR Button" into lmp-dev
...
* commit 'f8f71ad7ff4fd3d55c4d6e91fd200689d084c463':
Change "Media output" to "Cast" for MR Button
2014-07-23 21:55:26 +00:00
ztenghui
d610930f5b
am 69e50375: Add negative sign separation support in the pathData
...
* commit '69e50375f16662156c32e9cc6bce157b7778f8cc':
Add negative sign separation support in the pathData
2014-07-23 21:51:11 +00:00
Alan Viverette
357d2eef01
am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev
...
* commit '82b83fb53d55db088b82eb2cff700b7c2aa7fbd2':
Use activity for brightness dialog
2014-07-23 21:47:03 +00:00
ztenghui
5a836f74df
Add negative sign separation support in the pathData
...
bug:14585171
Change-Id: I61dec27856be09c44bb1d32ff61b3c3cd458cc34
2014-07-23 21:46:16 +00:00
destradaa
288ee8ca98
am 87a50e32: Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev
...
* commit '87a50e32b79d228bd22efb4913439a312914e755':
Expose Gps Navigation Messages in the platform. b/16405976
2014-07-23 21:39:22 +00:00
John Spurlock
66a7ca4971
am 0ee346e7: Doze: Manage screen state + brightness when teasing.
...
* commit '0ee346e7cf5d38284d1ff0f180f653c72cae72e6':
Doze: Manage screen state + brightness when teasing.
2014-07-23 21:22:50 +00:00
John Spurlock
ed69bd661f
Doze: Manage screen state + brightness when teasing.
...
Bug:15863249
Change-Id: I2e9574afd58594d1895777024529e90815c66913
2014-07-23 17:15:15 -04:00
RoboErik
ceab4684ff
am a9faa459: Merge "Change "Media output" to "Cast" for MR Button" into lmp-dev
...
* commit 'a9faa4594f061dbe4748954340dfc780ab8f601d':
Change "Media output" to "Cast" for MR Button
2014-07-23 21:12:00 +00:00
Adam Lesinski
2c72b6822d
Add <feature-group> tag and change aapt badging
...
A <feature-group> represents a set of features required
for an app to be compatible with a device. Multiple
<feature-group> elements represent a logical 'or'
of required features.
Features defined in the old way with <uses-feature> tags
under the <manifest> tag are automatically added to each
feature-group defined.
Defining a <feature-group> means that any default
features are not included (such as android.hardware.touchscreen)
and declared permissions do not imply any features.
Change-Id: I45626f0fdc546e47bcf2aead7ef05ebcca12b023
2014-07-23 14:11:46 -07:00
Robert Ly
39572996f2
am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
...
* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-23 21:06:47 +00:00
Scott Rowe
162493b5e3
am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
...
* commit '3bb44fecbb9643e68a52d19b9c90809c77367b3e':
cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
2014-07-23 21:06:36 +00:00
Robert Ly
1903bbb88d
am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
...
* commit '22bdcd2f829dd9226978c9ec4405fd89d4562d73':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-23 21:02:12 +00:00
Scott Rowe
3bb44fecbb
am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
...
* commit '72c80d308a88d59347f13dd813f2885bc4f45acc':
cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
2014-07-23 21:02:09 +00:00
RoboErik
7b73c30812
am 989779bb: am ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
...
* commit '989779bba5811dfcf1d9c0ff12d21469dfac3b72':
Return appropriately scaled artwork to RemoteController
2014-07-23 20:52:45 +00:00
Scott Rowe
72c80d308a
cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
...
Change-Id: I245d8351d82b29131783df71f78fcd7bc3c1d89e
2014-07-23 20:49:45 +00:00
RoboErik
188ae08ea2
am ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
...
* commit 'ae5b411b181e872c9a66fb504eb1ea789f601698':
Return appropriately scaled artwork to RemoteController
2014-07-23 20:48:57 +00:00
Jeff Sharkey
ff33a988dd
am af043268: am 7bf4f48f: Remove APK observers.
...
* commit 'af043268f0f27620be25de18109c7e1ba691906f':
Remove APK observers.
2014-07-23 20:33:16 +00:00
Yao Chen
295a14956e
am b0bc2aad: am 9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
...
* commit 'b0bc2aad61a11d97494f3e0e14e0b49c09563fbe':
various fixes in MediaBrowserItem and MediaBrowserService
2014-07-23 20:33:12 +00:00
Jeff Sharkey
477322fd43
am 7bf4f48f: Remove APK observers.
...
* commit '7bf4f48f7ca2c53a88b3aed6329a2d44eae7a96c':
Remove APK observers.
2014-07-23 20:29:36 +00:00
Yao Chen
987c9361bf
am 9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
...
* commit '9ea412ab9ecf1c78549542ce9f1715e814a7ba59':
various fixes in MediaBrowserItem and MediaBrowserService
2014-07-23 20:29:33 +00:00