Baligh Uddin
858b47ca1e
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-06-20 21:00:34 +00:00
Baligh Uddin
2d91bc2312
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-06-20 21:00:34 +00:00
Craig Mautner
5957d6a889
Merge "Fix frontOfTask assignment."
2014-06-20 21:00:34 +00:00
Danny Baumann
ec4e780e5c
Fix frontOfTask assignment.
...
If all activities of a given stack were finishing, no activity was
marked as front-of-task. This confused ActivityManager, so make sure
there's always exactly one activity marked as front-of-task.
Change-Id: I087cbe10280d4a60aa5ccfaefe24a223523fb3f2
2014-06-23 08:43:37 +02:00
ztenghui
f2d0020d93
Merge "Make AnimatedVectorDrawable public."
2014-06-20 20:04:02 +00:00
Cheuksan Wang
b72351da56
Merge "Add an API call to update the status of a pending outbound SMS message and resend by PSTN if necessary."
2014-06-23 17:14:09 +00:00
Jorim Jaggi
1129883011
Fade notification contents when expanding/contracting
...
Bug: 15284460
Change-Id: If0f18e0b8fc9e7410cc6ef2a7976bcec49a6eb6e
2014-06-23 17:36:07 +00:00
ztenghui
7e7ea9da67
Make AnimatedVectorDrawable public.
...
Clean up some useless VectorDrawable functions.
Add comments, too.
Change-Id: I8cc2165d14d09fd71f5830c4f61f9e8ac1d7c8da
2014-06-23 09:36:52 -07:00
Jay Civelli
23a0bf3c7f
Merge "Reenabling permission check for TrustAgent."
2014-06-21 03:15:09 +00:00
George Mount
eeda22b46f
Merge "Revert "Revert "API Review: Change View viewName attribute to transitionName."""
2014-06-21 03:15:09 +00:00
George Mount
0a2ae002e6
Revert "Revert "API Review: Change View viewName attribute to transitionName.""
...
This reverts commit 1bdfbc68e22a64215ab8fa3e3d17676513546997.
Change-Id: Ie3fdf53b33cb2f61c1878055940f52ed9dfc8b08
2014-06-23 14:57:27 +00:00
John Reck
a3c1025b80
Revert "API Review: Change View viewName attribute to transitionName."
...
This reverts commit f1b1adf51b2a84e0ac83685812c7e8d86590af12.
Change-Id: I0e49aeed84f2a548e272a59f4e13c3fb74c2bfd9
2014-06-23 14:51:44 +00:00
Chris Craik
53a8d5c4d0
Merge "Update 'DisplayList' vs 'RenderNode' naming in several places"
2014-06-23 14:51:00 +00:00
Chris Craik
a7090e0cfd
Update 'DisplayList' vs 'RenderNode' naming in several places
...
Change-Id: I635c6627d098b661fb9b0ba1bd42fa6d7277d287
2014-06-23 09:57:07 -07:00
Quddus Chong
b643a659d1
am d0027fd6: am 11b319c2: Merge "docs: Updated L Preview Highlights." into klp-modular-dev
...
* commit 'd0027fd67fcf8b57131c76752b3ad3b0fe1b230b':
docs: Updated L Preview Highlights.
2014-06-23 16:48:52 +00:00
ztenghui
eb034fbca4
AVD now support path morphing.
...
Basically extended the ValueAnimator to support a new type: pathType.
Add the PathDataEvaluator internally to interpolate path data.
Update test to show the path morphing.
Change-Id: I89db0199cbc12e3041790a6115f3f50b80213cdb
2014-06-20 15:16:47 -07:00
Elliott Hughes
104ef50048
Merge "Track API."
2014-06-20 21:00:34 +00:00
Brian Carlstrom
78e51f360d
am 9e36a8cd: am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case"
...
* commit '9e36a8cd3e106e5a2bb0d5cce805842b61e05426':
Treat missing package usage data as a separate case
2014-06-23 15:51:22 +00:00
Craig Mautner
75dc9900c6
am 9587ee02: am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment."
...
* commit '9587ee02038f20602d1ab79610e8c19b9633ab81':
Fix frontOfTask assignment.
2014-06-23 15:03:59 +00:00
John Reck
4fb48d24bb
Merge "Revert "API Review: Change View viewName attribute to transitionName.""
2014-06-23 14:51:00 +00:00
Elliott Hughes
0a4d4275a7
Track API.
...
Change-Id: Iba80dfebe6f02ad1487d922c4c88042c34999528
2014-06-22 18:27:56 -07:00
Robert Ly
2428fe4219
am 54a7b932: am 50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev
...
* commit '54a7b9325bfb55d124dd66534a2fdca60093ea7e':
docs: add whitelisting instructions and new index icons
2014-06-22 01:16:45 +00:00
Dirk Dougherty
247b896903
am da6b3222: am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs
...
* commit 'da6b32226a40abaeeca3e00780ddffd3cd554241':
remove extraneous tag causing extra spacing between heading/text.
2014-06-22 01:16:39 +00:00
smain@google.com
4c83bf4b03
am 92cb2a75: am e77f41a6: prettier sdk buttons
...
* commit '92cb2a75222d4b0055f155ae6f243925a4801403':
prettier sdk buttons
2014-06-22 01:16:34 +00:00
smain@google.com
747a2f1913
am 9ea14362: am 941f800a: update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL
...
* commit '9ea14362554e412564a65821a47762c4f28b87a9':
update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL
2014-06-22 01:16:29 +00:00
smain@google.com
99d3bd0b95
am 3a4924d4: am 371d68cc: add link back to main dev site home
...
* commit '3a4924d417640c13f9418a6dd1d68303b8b21e10':
add link back to main dev site home
2014-06-22 01:16:24 +00:00
Michael Kolb
8dab261d81
am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev
...
* commit 'c6ffc840c4e34a61b537e1fc3e90b111d4150244':
Move emulator check & save system properties access
2014-06-22 01:16:19 +00:00
Craig Mautner
5afcd4df22
resolved conflicts for merge of aaadf922 to master
...
Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c
2014-06-21 18:11:33 -07:00
Deepanshu Gupta
a88738ff52
am 3daec197: Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev
...
* commit '3daec1972493c1e867c6cac7f4a2a43a157d52b9':
LayoutLib: Better support for compact/elegant fonts.
2014-06-21 23:35:51 +00:00
Deepanshu Gupta
4a2ff7a4d8
am f791b120: Merge "Material navigation bar for layoutlib." into lmp-preview-dev
...
* commit 'f791b1205192e525590f72c465e7e4c185112eb0':
Material navigation bar for layoutlib.
2014-06-21 23:35:43 +00:00
Michael Kolb
c0fcf109f0
am 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev
...
* commit '71f65485bf47c8bfbae2b3a0a9573b311668b4a2':
Make WindowInsets.isRound work with emulator
2014-06-21 20:24:28 +00:00
Joe Fernandez
4bae7d39ff
am 82d013d4: am 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
...
* commit '82d013d45ab86ee1a4e1a64960f6ac1260d66a66':
ExoPlayer developer guide
2014-06-21 20:24:23 +00:00
Robert Ly
8cadff247f
am 5c26b33e: am d8b94456: fix build
...
* commit '5c26b33e4abfc820677f6af566bb9952a535efd7':
fix build
2014-06-21 20:24:18 +00:00
Robert Ly
8f94d781bf
am 9e51442c: am 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev
...
* commit '9e51442ca5ee1bb0ebdae656d45657bdc17f3666':
docs: fix l preview bugs
2014-06-21 20:24:12 +00:00
Robert Ly
3ad3a485f3
am 31dde385: am 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev
...
* commit '31dde385674be85c98add60d020b13572d18de1a':
docs: fix margins and add partners back
2014-06-21 20:24:06 +00:00
Chet Haase
3aff2a0813
Avoid resetting gradient state when not actually rebuilding it
...
Previous logic in GradientDrawable around rebuilding the gradient path
was incorrect, but it happened to work because of when it was called
(after ensureValidRect() in the draw() method). Further reliance on this
logic outside of the drawing cycle (in the new getOutline() method) caused
the side-effect to surface as we now clear the dirty flag without actually
rebuilding the gradient.
Fix avoids resetting the flag outside of ensureValidRect() where it belongs.
Issue #15508378 Quantum ui having issues with viewing comments on facebook app
Change-Id: Ia944d3de7e3c0920fed040188e8c1cc1bcce498d
2014-06-21 08:31:03 -07:00
George Mount
7a73fda47d
Merge "API Review: Change View viewName attribute to transitionName."
2014-06-21 03:15:09 +00:00
Deepanshu Gupta
b337295654
Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev
2014-06-20 21:00:34 +00:00
Deepanshu Gupta
0a1335d770
Merge "Material navigation bar for layoutlib." into lmp-preview-dev
2014-06-20 20:43:34 +00:00
Ji-Hwan Lee
8865275ebc
DO NOT MERGE: Use main looper for PackageMonitor
...
This is to work-around the issue that TvInputManagerService does not
receive package change callbacks from PackageMonitor.
In ATV emulator build, the background thread is blocked at
android_location_GpsLocationProvider_init(), and PackageMonitor that uses
background thread fails to handle broadcast intent.
Bug: 15767453
Change-Id: Ieef00cedf1357d57e4217ec202d50655ba3aa35a
2014-06-21 06:31:12 +09:00
Ji-Hwan Lee
0ceb7e4755
Register PackageMonitor when system services are ready
...
Bug: 15767453
Change-Id: I191b20dfa31eee0e37ba7df67cbf906ccbfc0f4e
2014-06-21 06:30:49 +09:00
Brian Carlstrom
0547ce55eb
Treat missing package usage data as a separate case
...
Bug: 15520936
Change-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf
2014-06-20 12:53:19 -07:00
George Mount
125578a863
API Review: Change View viewName attribute to transitionName.
...
Bug 15548520
Change-Id: I4009458d83dbffb20ff0100aaa42eea44d943378
2014-06-20 11:01:01 -07:00
Calin Juravle
a06f5fa656
Merge "Fix the initialization of some profile properties"
2014-06-20 03:03:45 +00:00
Cheuksan Wang
87487466af
Add an API call to update the status of a pending outbound SMS message and
...
resend by PSTN if necessary.
Change-Id: Id847b182874bef057473acf293cee43d9d55f7ab
2014-06-19 18:51:13 -07:00
Winson Chung
89bb755aed
Merge "Ensuring that we unload all resources after a transition."
2014-06-20 00:30:35 +00:00
Winson Chung
653b0d6a59
Ensuring that we unload all resources after a transition.
...
- Fixed case where we weren't deleting task data after it was removed via a package event
- Reducing time for dismiss button to appear
- Working around animation issue where we appear to see frames before the animation starts (perhaps it is posted now?)
Change-Id: I1dc0e203485f517e7384b0f7ee08979bfd286013
2014-06-20 19:03:16 -07:00
Ruben Brunk
5e6421bd8f
Merge "camera2: Switch to using YV12 for ImageReader."
2014-06-20 20:43:34 +00:00
Ying Wang
7c0e6219c3
Fix build.
...
Change-Id: I2b161a4020862d83347d5a8989467c612fff08db
2014-06-20 17:30:45 -07:00
Dianne Hackborn
07f08d5043
Merge "Add some wifi tracking to battery stats."
2014-06-20 02:09:17 +00:00