smain@google.com
7250cf4e7c
resolved conflicts for merge of 122ee7e8 to master
...
Change-Id: I6224605fd05dcfe1d5f351a01bc411c6855d0e52
2014-06-13 17:54:26 -07:00
smain@google.com
122ee7e861
am 78219f04: update download pages for SDK and remove /tools landing page.
...
* commit '78219f0466a1924e8edb1a0b7a40b7d51d7f6283':
update download pages for SDK and remove /tools landing page.
2014-06-13 22:40:49 +00:00
Craig Mautner
3a040c1b18
Merge "Revert "Revert "Close ActivityView and ActivityContainer cleanly."""
2014-06-13 21:09:46 +00:00
Craig Mautner
d163e75189
Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
...
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
Change-Id: I7bac1aa1d96fa7922cc835949730a26204f15f2f
2014-06-13 17:39:35 -07:00
Craig Mautner
bc2a6dff1f
Do not treat the dummy animation as an animation
...
The dummy animation is a place holder. When the task stack is being
removed treating it as a true animation forced us through a path
where we deferred the detachment and made a call to tmpRemoveWindows.
Also replaced call to tmpRemoveWindows with a real remove windows
call. The tmpRemoveWindows call does not clean up the Session
and this leaves a surface on the screen.
Fixes bug 15591610.
Change-Id: I05f7bc276bfed2366bbcd8443c92a4bbbc8a4491
2014-06-13 17:33:15 -07:00
Winson Chung
42617c3773
Merge "Cleaning up some old animation code, only setting view properties that have changed."
2014-06-13 21:09:46 +00:00
Winson Chung
b5ddfc3756
Cleaning up some old animation code, only setting view properties that have changed.
...
- Also drawing a background on the thumbnails if a transparent thumbnail is detected.
Change-Id: I3f5450d207ae0796150c8b04aabc2f910f80e0a7
2014-06-14 00:39:28 +00:00
Winson Chung
743d5c95f3
Clipping the task bar against the task view.
...
- Skipping nav bar scrim animation when animating without window transitions
Change-Id: I8652f3956971f07bb410b801bf627d51c5e987cd
2014-06-13 15:27:47 -07:00
Alan Viverette
a8e9529b73
Merge "Support hotspots in View drawables"
2014-06-13 21:09:46 +00:00
Alan Viverette
996ed45b0d
Fix bright foreground & hint colors
...
BUG: 15616463
Change-Id: I747a3fd30e701bd2ee40df5faf2688cd5af4ee14
2014-06-13 15:58:25 -07:00
Alan Viverette
cebc6bab51
Support hotspots in View drawables
...
BUG: 15285217
Change-Id: Iad44454fe16ac27ed20b9c17ae2df69649339eed
2014-06-13 15:52:13 -07:00
smain@google.com
78219f0466
update download pages for SDK and remove /tools landing page.
...
Change-Id: I7e883a2647d7c487570c4abdba9df5d72a52b274
2014-06-13 13:26:43 -07:00
Andrew Solovay
79130d1de3
am 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.
...
* commit '81be9239fd9bf4122757a23e143c0aa1b925b42b':
docs: Added "Verifying for ART" to TOC.
2014-06-13 18:29:36 +00:00
Andrew Solovay
81be9239fd
am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.
...
* commit 'bd8ca9f9adf10a5b7e1e04ed139e4108758e286f':
docs: Added "Verifying for ART" to TOC.
2014-06-13 18:25:53 +00:00
Andrew Solovay
bd8ca9f9ad
am 4737af8b: docs: Added "Verifying for ART" to TOC.
...
* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
docs: Added "Verifying for ART" to TOC.
2014-06-13 18:23:03 +00:00
Andrew Solovay
4737af8b0a
docs: Added "Verifying for ART" to TOC.
...
Now that "Verifying App Behavior on the Android Runtime (ART)"
(guide/practices/verifying-apps-art.jd) is published, also adding it
to the "API Guides" TOC.
You can verify it at
http://asolovay.mtv:9001/guide/practices/index.html
(...it's the last element in the "Best Practices" submenu.)
Change-Id: If7b445616768d17193309dbd3075b2630652ac96
2014-06-13 10:52:29 -07:00
Justin Koh
0f3d3dd26c
am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
...
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
Revert "Close ActivityView and ActivityContainer cleanly."
2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170
Revert "Close ActivityView and ActivityContainer cleanly."
...
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.
Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07:00
Winson Chung
ad6f276670
Enabling Home->Recents transition.
2014-06-13 09:41:09 -07:00
Jeff Brown
cd4c754e99
am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
...
* commit '374013f4dba56c9ea340d22dcefdf904cbd47ce6':
Suppress haptic feedback for SLEEP key when already asleep.
2014-06-13 03:08:35 +00:00
Jeff Brown
1a073a8f55
am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev
...
* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
When watch is docked, home key press should launch dock home.
2014-06-13 03:04:25 +00:00
Winson Chung
a26fb7822d
Fixing issues with dim not animating, adding dismiss button delay, tweaking empty recents text. (Bug 15431590, 15573497)
...
Change-Id: I9c11e04cd52f9e000d8ba3e443f2500c9aa7edbb
2014-06-12 19:08:29 -07:00
Craig Mautner
4849aa86b1
am be634951: Fix permission problem and NPE
...
* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
Fix permission problem and NPE
2014-06-12 23:36:54 +00:00
Tim Murray
604ea0e415
am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
...
* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
Move FieldPacker over to use large objects on 64-bit.
2014-06-12 23:08:39 +00:00
Tim Murray
b1c9430c87
am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
...
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
Move FieldPacker over to use large objects on 64-bit.
2014-06-12 23:05:16 +00:00
Nick Kralevich
50ece5ec53
am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."
...
* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
Add service_contexts to policy update bundles.
2014-06-12 21:10:30 +00:00
Jeff Brown
374013f4db
Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
2014-06-12 21:07:47 +00:00
Jeff Brown
bae8e77db6
Suppress haptic feedback for SLEEP key when already asleep.
...
Bug: 15377857
Change-Id: I4dfd273b089871d3a78513f52436a3f9c7d40fa4
2014-06-12 19:59:45 -07:00
Jeff Brown
4f5fa285a8
When watch is docked, home key press should launch dock home.
...
Bug: 15575717
Change-Id: Ib3fbe3ed0380378b0162901bfeebe3c218c4d568
2014-06-12 19:19:15 -07:00
Nick Kralevich
9a0485aa56
am 1ef888e5: Merge "Add service_contexts to policy update bundles."
...
* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
Add service_contexts to policy update bundles.
2014-06-12 21:07:25 +00:00
Winson Chung
9214eff52a
Fix regression in using visibility flags.
2014-06-12 13:59:25 -07:00
Craig Mautner
be63495101
Fix permission problem and NPE
...
Remove uid before calling into Window Manager. Restore afterwards.
Check for null stack value before dereferencing.
Fixes bug 15591112.
Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8
2014-06-12 13:50:53 -07:00
Deepanshu Gupta
1434ea749f
am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev
...
* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
LayoutLib fixes for API 20 [DO NOT MERGE]
2014-06-12 20:04:12 +00:00
Winson Chung
d42a6cfe2b
Exploring transitions to/from Recents.
...
- refactored hwlayers and change view property animations to use a reference counted trigger
- cleaned up RecentsConfiguration, and move it into classes using it
- moved task bar animations back into TaskBarView
- refactoring enter/exit animations to use an animation context
Change-Id: Ia66b622b094f22145c2fab07c2a9bdfd62344be2
2014-06-12 12:57:56 -07:00
Scott Main
91b078c8dc
am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev
...
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
2014-06-12 19:04:34 +00:00
Andrew Solovay
d51a5b3891
am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
...
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f
am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
...
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3
am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
...
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:19:33 +00:00
Jeff Brown
926e1f01a5
Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev
2014-06-12 05:34:42 +00:00
Tim Murray
77d28ca253
Merge "Move FieldPacker over to use large objects on 64-bit."
2014-06-12 05:34:11 +00:00
Tim Murray
4154bbd69b
Move FieldPacker over to use large objects on 64-bit.
...
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
2014-06-12 14:23:19 -07:00
Nick Kralevich
1ef888e564
Merge "Add service_contexts to policy update bundles."
2014-06-12 03:32:07 +00:00
Riley Spahn
5f5cf5f670
Add service_contexts to policy update bundles.
...
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.
Bug: 12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
2014-06-12 20:46:34 +00:00
Dirk Dougherty
866ad0c2b2
am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
...
* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
Doc change: Update monetization docs.
2014-06-12 02:44:11 +00:00
Dirk Dougherty
460cab199d
am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
...
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
Doc change: Update monetization docs.
2014-06-12 02:41:07 +00:00
Dirk Dougherty
b024fd2087
am bdcd6fc7: Doc change: Update monetization docs.
...
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
Doc change: Update monetization docs.
2014-06-12 02:37:27 +00:00
Dirk Dougherty
bdcd6fc777
Doc change: Update monetization docs.
...
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
2014-06-11 17:52:07 -07:00
Elliott Hughes
b952587184
am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
...
* commit '8525fe8d0a5a886704307055ef211fc911997783':
Switch to a type-safe album art interface.
2014-06-12 00:06:20 +00:00
Elliott Hughes
8525fe8d0a
am 1a3908e9: Merge "Switch to a type-safe album art interface."
...
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
Switch to a type-safe album art interface.
2014-06-12 00:02:42 +00:00
Craig Mautner
f5030ecbca
am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
...
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00