139811 Commits

Author SHA1 Message Date
Andy McFadden
45b161d24d Merge "Make two Display methods public" 2014-06-18 22:47:18 +00:00
Andy McFadden
77db7d09ff Make two Display methods public
Un-hide getAppVsyncOffsetNanos() and getPresentationDeadlineNanos().

Bug 14612039

Change-Id: I76bee166b7bda3b96db36ffcb8d946d2b713ac09
2014-06-18 10:45:27 -07:00
Robin Lee
aab72f3b0a Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs""" 2014-06-17 21:55:55 +00:00
Robin Lee
306fe08ce2 Revert "Revert "Publish DevicePolicyManager CA certificate APIs""
This reverts commit 792b270dbdc980cfe04e8d461bf00a1f45b5e936.

Change-Id: I18c7e0eca39868230cd8e4f4bbeb3c44ff9e8b78
2014-06-19 14:04:24 +00:00
George Mount
54fb7e94d0 Merge "Handle interruptions in Explode and Slide transitions." 2014-06-19 00:17:11 +00:00
George Mount
1f8c01181b Handle interruptions in Explode and Slide transitions.
Bug 15618842

Change-Id: I22431b59c6516ee330d897791b79fa9ed17ba727
2014-06-18 16:48:45 -07:00
George Mount
52cd83e6cf Merge "Don't make translucent window opaque during activity transition." 2014-06-18 22:47:18 +00:00
George Mount
3cc716c445 Don't make translucent window opaque during activity transition.
Bug 15535332

Returning transitions will continue to not work until
Bug 14869070 is fixed.

Change-Id: If0128b58eb852b037924ae6dea8e975fedbe5be7
2014-06-18 20:21:47 +00:00
Chris Craik
e48df00575 Merge "Clean up tessellation cache in prep for other tesselation types" 2014-06-18 19:24:54 +00:00
Chris Craik
6ac174b972 Clean up tessellation cache in prep for other tesselation types
bug:15536396

Also fixes compilation warning, avoids SkPaint deep copy

Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b
2014-06-18 15:31:55 -07:00
Jason Monk
b593539faf Fix docs breakage from refactor
Change-Id: I567249542ee02e4bde3e0e03cdfae8969104c1b8
2014-06-18 18:28:46 -04:00
George Mount
1798208443 Merge "Fix blinking animation during Visibility transitions." 2014-06-18 19:24:54 +00:00
George Mount
4c20ea2972 Fix blinking animation during Visibility transitions.
Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
2014-06-18 11:13:06 -07:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs"
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00:00
Nicolas Prevot
e7cd37e613 Merge "Introducing crossProfileIntentFilters that skip the current profile." 2014-06-17 21:55:55 +00:00
Kenny Guy
f7ecf7c805 Add badging a label to support accessibility.
To provide a way to differntiate the content description
of an icon that has been badged with a managed profile
badge.

Bug: 15106236
Change-Id: Icd5798bbd2410a105054877e3862e199eff24b88
2014-06-19 13:17:02 +01:00
Kenny Guy
63860956f1 Update corp badging assets.
Same assets just as vectors rather than pngs.

Bug: 15445217
Change-Id: I33cc299b7f83b62d06334b387b56b1636fdbe851
2014-06-19 12:20:16 +01:00
Robert Ly
1eb6007d8c am 611e591a: am 4d521ed9: Merge "new lmp prev landing page" into klp-modular-dev
* commit '611e591a3a7e66f2cac3777cc2b44e47b1327b41':
  new lmp prev landing page
2014-06-19 10:04:10 +00:00
Ricardo Cervera
0cfbf7adc9 am c9376693: am 10276c32: Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev
* commit 'c93766932efbbc4cc1fa963380bbfbcdb5303cf7':
  docs: Updated the screenshot for the Android Studio page.
2014-06-19 10:04:05 +00:00
Robert Ly
611e591a3a am 4d521ed9: Merge "new lmp prev landing page" into klp-modular-dev
* commit '4d521ed9663a7a4f938b3c09f06af557614ca3d3':
  new lmp prev landing page
2014-06-19 08:53:46 +00:00
Ricardo Cervera
c93766932e am 10276c32: Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev
* commit '10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e':
  docs: Updated the screenshot for the Android Studio page.
2014-06-19 08:53:29 +00:00
Stephen Hines
7f22d01545 am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit 'c5b11fcc1f4fc4fba988218d0a99a19690398a56':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-19 03:26:15 +00:00
Stephen Hines
c5b11fcc1f am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit 'ff83ed2dc34f0595bcff2cb7b5d71bb39191963e':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-19 03:18:17 +00:00
Quddus Chong
6f2b8e55ee am 99a25dd3: am 84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev
* commit '99a25dd3912a67498966728dcf7834450fbba3f6':
  docs: Updates to L Preview Highlights.
2014-06-19 03:16:28 +00:00
Stephen Hines
ff83ed2dc3 am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
* commit 'b02dadd47c20b65569413cb4575c6050fe7b609f':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-19 03:13:37 +00:00
Quddus Chong
99a25dd391 am 84611a1f: Merge "docs: Updates to L Preview Highlights." into klp-modular-dev
* commit '84611a1fe13299e3279d9bc5b0a2ec33d54c7e92':
  docs: Updates to L Preview Highlights.
2014-06-19 03:12:34 +00:00
Brian Carlstrom
7f047f02ad am 80f1fe5f: am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit '80f1fe5f7cc80b6f1da142c782ccbbad45d878a8':
  Switch from core to core-libart
2014-06-19 02:16:34 +00:00
Brian Carlstrom
80f1fe5f7c am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc':
  Switch from core to core-libart
2014-06-19 02:08:10 +00:00
Brian Carlstrom
f8077cf2d7 am 8e21e215: Merge "Switch from core to core-libart"
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart
2014-06-19 02:03:35 +00:00
Robert Ly
4d521ed966 Merge "new lmp prev landing page" into klp-modular-dev 2014-06-19 00:17:11 +00:00
Robert Ly
26115661a3 new lmp prev landing page
Change-Id: I28cf943e21fc9b1e3c044830ac21079d5464dee8
2014-06-18 23:50:29 -07:00
Quddus Chong
84611a1fe1 Merge "docs: Updates to L Preview Highlights." into klp-modular-dev 2014-06-19 00:17:11 +00:00
Quddus Chong
17305644a8 docs: Updates to L Preview Highlights.
Change-Id: Ie64c90eebab7fc740c30f6881e6408d634e0c919
2014-06-18 20:02:24 -07:00
Jason Sams
3aa4de11b0 am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b
2014-06-18 23:08:35 +00:00
Jason Sams
802aaf3b9d am 47de3060: Merge "Fix element size on 64b"
* commit '47de306050576535014ff2b0c08006f951eea2ee':
  Fix element size on 64b
2014-06-18 22:54:08 +00:00
Stephen Hines
b02dadd47c Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 2014-06-18 22:48:04 +00:00
Brian Carlstrom
8e21e21550 Merge "Switch from core to core-libart" 2014-06-18 22:48:04 +00:00
Brian Carlstrom
dbcae5ceb7 Switch from core to core-libart
Bug: 14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
2014-06-18 17:43:27 -07:00
Ricardo Cervera
10276c32ec Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev 2014-06-18 22:47:18 +00:00
Mark Renouf
7deaf7c530 am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev
* commit 'f2dcb390444ffb42cf8637c99f53d821917554e6':
  Limit swipe dismiss progress to positive values
2014-06-18 19:37:02 +00:00
Ye Wen
5376c00db3 Merge "Move IMms.aidl to frameworks/base (2/3)" 2014-06-18 19:24:54 +00:00
Ye Wen
369a107fd6 Move IMms.aidl to frameworks/base (2/3)
Change-Id: Ia771496f92a841c72d950212b2f525aa0c733d7f
2014-06-18 18:25:20 -07:00
Winson Chung
47d1206fb8 Merge "Toggling Recents from home should actually toggle Recents instead of launching the first task." 2014-06-19 00:17:11 +00:00
Winson Chung
1f76132d4d Toggling Recents from home should actually toggle Recents instead of launching the first task.
Change-Id: Id60c54839c9f13299ec8d514e73e37c10735f30c
2014-06-18 18:21:42 -07:00
Winson Chung
7ab650cb43 Adding start delay to the task view transforms.
- Adding slight delay to task bar buttons to allow touch feedback to show

Change-Id: I9f31ca378541fc34c7b741840c7f038340684b13
2014-06-18 14:30:32 -07:00
Robert Ly
8312bfd618 am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
* commit '5cfea84264911b93057a667cbcaf90e10740d658':
  docs: add allowembedded
2014-06-18 18:33:31 +00:00
Alan Viverette
88dc8f1e41 Merge "Fix clamped starting position, seek bar hotspot bounds" 2014-06-18 18:28:24 +00:00
Alan Viverette
304624100b Fix clamped starting position, seek bar hotspot bounds
BUG: 15720430
Change-Id: I11d40c747ea1a3665e9e2058d95dda1bc8a547ab
2014-06-18 17:54:58 -07:00
Alan Viverette
29fa90490b Merge "Fix switch & slider anim, make View drawable hotspot API public" 2014-06-18 18:28:24 +00:00
Alan Viverette
8de1494557 Fix switch & slider anim, make View drawable hotspot API public
BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f
2014-06-18 18:05:15 -07:00