Jeff Tinker
72eec7f6c9
Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
2014-04-21 20:58:49 +00:00
Adam Lesinski
370cda7074
Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev
2014-04-21 20:18:11 +00:00
Ariel Gertzenstein
fe7550548d
Merge "DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev
2014-04-21 18:41:53 +00:00
Ariel Gertzenstein
a2d8706ca8
DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request
...
after establishing a PANU connection.
http://b/13731957
Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
2014-04-21 14:26:56 -04:00
Baligh Uddin
43ca5efaf0
Import translations. DO NOT MERGE
...
Change-Id: Ieb3e0b6128807111d32faa3681839723fd47e8f1
Auto-generated-cl: translation import
2014-04-21 11:19:33 -07:00
Mike Lockwood
eaabdce0ad
am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
...
* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521':
MTP: Fix getThumbnail
2014-04-21 16:40:18 +00:00
Mike Lockwood
ca1f8f6d14
am c4367721: MTP: Fix getThumbnail
...
* commit 'c436772120ceea1d6e3f5b388ef068c99c8bb7d6':
MTP: Fix getThumbnail
2014-04-21 16:31:51 +00:00
Mike Lockwood
c436772120
MTP: Fix getThumbnail
...
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.
Bug: 13747419
Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
2014-04-21 08:54:45 -07:00
Jinsuk Kim
cbafd1b3ea
Move logical address allocation logic into native service from HAL
...
Logical address logic is independent from hardware, and the algorithm is
standardized in the spec. Moved the logic to service so that all HAL
implementations doesn't have to duplicated logic inside.
Related change in HAL definition is in:
https://googleplex-android-review.git.corp.google.com/#/c/447951/
Change-Id: I9699309719f3214fc2dbdf219faad484c0c1c5bf
2014-04-21 07:42:35 +09:00
Kenny Root
0090082ed0
resolved conflicts for merge of 89a086c1 to klp-modular-dev
...
Change-Id: Iaa82bfc87fb3af2e8e78597c6f2517e7dad7c130
2014-04-18 16:15:13 -07:00
Kenny Root
89a086c16f
am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
Use hidden API to validate APK chains
2014-04-18 23:05:30 +00:00
Kenny Root
cf677a37fb
am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'e00c9185262c675f1680920c258413299995042a':
Use hidden API to validate APK chains
2014-04-18 23:00:37 +00:00
Kenny Root
e00c918526
am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
Use hidden API to validate APK chains
2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f
am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
Use hidden API to validate APK chains
2014-04-18 22:50:12 +00:00
Kenny Root
6888bee598
am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
Use hidden API to validate APK chains
2014-04-18 22:43:08 +00:00
Kenny Root
5a0cc78929
am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
2014-04-18 22:37:38 +00:00
Kenny Root
2ed5f771c4
am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
2014-04-18 22:31:08 +00:00
Kenny Root
47231936c0
am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
Use hidden API to validate APK chains
2014-04-18 22:26:03 +00:00
Kenny Root
02bc4b0423
am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
Use hidden API to validate APK chains
2014-04-18 22:21:37 +00:00
Kenny Root
4a62a6dce9
am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
2014-04-18 22:14:14 +00:00
Adam Lesinski
c0f6eed40f
Allow InputEvents to propagate w/o IME
...
If no IME was present, InputEvents such as KeyEvents
would simple be dropped instead of going through
to the Activity's View hierarchy.
Change-Id: I9de25bdbf5d1564b77b25679e19dae18591a8c1c
2014-04-18 14:52:04 -07:00
Kenny Root
451ed5f077
am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
2014-04-18 21:33:04 +00:00
Ricardo Cervera
d5ed804f6f
am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
...
* commit 'a7b6271820e464b3aae955013b25f5b04f3ff9e1':
docs: Watermarked images for codes that weren't found.
2014-04-18 19:12:59 +00:00
Ricardo Cervera-Navarro
fed2c410ab
am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
...
* commit '4874938ad3fb0d0ab56b24cb18c8943a72559f12':
Revert "docs: Watermark images with easter eggs"
2014-04-18 19:12:53 +00:00
Ricardo Cervera
a7b6271820
am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
...
* commit '974588d149812ee5420f55e3fd3182045b1e915b':
docs: Watermarked images for codes that weren't found.
2014-04-18 19:08:09 +00:00
Ricardo Cervera-Navarro
4874938ad3
am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
...
* commit '84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
Revert "docs: Watermark images with easter eggs"
2014-04-18 19:08:05 +00:00
Ricardo Cervera
974588d149
Merge "docs: Watermarked images for codes that weren't found." into klp-docs
2014-04-18 19:02:04 +00:00
Ricardo Cervera-Navarro
84e6bc61c6
Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
2014-04-18 19:01:48 +00:00
Ricardo Cervera
453df8e6e3
docs: Watermarked images for codes that weren't found.
...
Details:
Line 84
http://goo.gl/1QTi2T
http://developer.android.com/design/get-started/ui-overview.html
http://developer.android.com/design/media/ui_overview_notifications.png
Line 81
http://goo.gl/bHjQsk
http://developer.android.com/design/style/touch-feedback.html
http://developer.android.com/design/media/touch_feedback_communication.png
Line 76
http://goo.gl/HGUj4v
http://developer.android.com/design/patterns/navigation-drawer.html
http://developer.android.com/design/media/navigation_drawer_titles_icons.png
Line 11
http://goo.gl/yYQniH
http://developer.android.com/design/patterns/selection.html
http://developer.android.com/design/media/selection_adjusting_actions.png
Line 10
http://goo.gl/M2QJa7
http://developer.android.com/design/building-blocks/dialogs.html
http://developer.android.com/design/media/dialogs_examples.png
Change-Id: I5df9288b97a9ca58df9f596ae6624c5c91911b3a
2014-04-18 11:54:03 -07:00
Ricardo Cervera-Navarro
326e4a5907
Revert "docs: Watermark images with easter eggs"
...
This reverts commit dc9ca02c51ecc4468e60c391f8357b5025d6eef1.
Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752
2014-04-18 18:34:41 +00:00
Kenny Root
3ecaa88d83
am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
2014-04-18 18:14:32 +00:00
Kenny Root
ecb013dbff
Merge "Use hidden API to validate APK chains" into jb-dev
2014-04-18 17:12:40 +00:00
Ricardo Cervera
d09e1bffe4
am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs
...
* commit 'ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
docs: Added the play from search intent. Bug: 13473141.
2014-04-18 01:54:31 +00:00
Ricardo Cervera
ed5b8c06bb
am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs
...
* commit '6aeea4549787ec282d2ca42b8495b87645958fc9':
docs: Added the play from search intent. Bug: 13473141.
2014-04-18 01:49:50 +00:00
Ricardo Cervera
6aeea45497
Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs
2014-04-18 01:46:25 +00:00
Michael Kolb
4abbd0a685
Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev
2014-04-18 00:44:35 +00:00
Michael Kolb
6642e51ac5
Populate isRound from config.xml to WindowInsets
...
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
2014-04-17 17:32:50 -07:00
Mindy Pereira
cb54f978b5
Merge "Update window alpha at the same time as translating" into klp-modular-dev
2014-04-17 22:53:24 +00:00
Vinit Deshapnde
2585e15ef7
am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
...
* commit '72358802d6135c633dd158f44b988e4f4075e6fd':
Don't reset country code once it is persisted
2014-04-17 21:57:12 +00:00
Mindy Pereira
b0ea484615
Update window alpha at the same time as translating
...
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept
Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
2014-04-17 14:53:24 -07:00
Jeff Brown
8e1e40066b
Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
2014-04-17 21:49:49 +00:00
Simon Wilson
3c8bbe245e
Check that mRemotePlayer is not null before use
...
Bug: 14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
2014-04-17 14:16:52 -07:00
Kenny Root
16c6b177ee
Use hidden API to validate APK chains
...
Bug: 13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
2014-04-17 14:03:33 -07:00
Ricardo Cervera
a3b13847b0
docs: Added the play from search intent. Bug: 13473141.
...
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
2014-04-17 12:31:18 -07:00
Ricardo Cervera
a28bcbc961
docs: Added release notes for ADT 22.6.3
...
Change-Id: Ic79a03a40db39e66adb226518ddaaeeaf13d17b2
2014-04-17 12:10:24 -07:00
Vinit Deshapnde
72358802d6
am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
...
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
Don't reset country code once it is persisted
2014-04-17 18:59:54 +00:00
Vinit Deshapnde
45e7467666
Merge "Don't reset country code once it is persisted" into klp-dev
2014-04-17 18:54:58 +00:00
Vinit Deshapnde
b5ee95edf9
Don't reset country code once it is persisted
...
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.
Also removes some dead code related to resetting of country codes.
Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
2014-04-17 11:05:21 -07:00
Baligh Uddin
b279f5272e
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-04-17 15:48:38 +00:00
Deepanshu Gupta
59dfbb91ca
Fix build [DO NOT MERGE]
...
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.
Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
2014-04-17 00:14:28 -07:00