Adam Powell
3b939b7242
am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev
...
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
Update route count properly when MediaRouteButton detects grouped/ungrouped events
2012-06-23 05:36:54 -07:00
Scott Main
b9975454ed
am fa54ba47: Merge "docs: change class names for links to design docs" into jb-dev
...
* commit 'fa54ba47f34a8d536636f823b8085b043b4fd2d6':
docs: change class names for links to design docs
2012-06-23 05:36:50 -07:00
Scott Main
6f3e5e03cf
docs: remove ICS from developer hompage
...
Change-Id: I6c2ca0f8e859a65f2de1d73198af9fd40d374f95
2012-06-22 22:18:26 -07:00
Scott Main
4708d8f54b
Merge "docs: add jelly bean to homepage" into jb-dev
2012-06-22 21:23:20 -07:00
Scott Main
32c1c5cedc
docs: add jelly bean to homepage
...
Change-Id: I9e94eca22b7255ee84afc5b5ba320368bdfe2200
2012-06-22 21:21:35 -07:00
Adam Powell
1b4ea7eff5
Sanity check while updating volume in MediaRouteChooserDialog
...
Bug 6720224
When a window dies it's possible to receive a lingering ACTION_CANCEL
event to the SeekBar for volume. Be sure that we don't try to mess
with something that's already gone by that point.
Change-Id: I4f6119718fc21204d9013d591bc984b785b698b4
2012-06-22 20:41:31 -07:00
The Android Automerger
5611a76418
merge in jb-release history after reset to jb-dev
2012-06-22 20:37:59 -07:00
Adam Powell
fd3fd482ab
Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev
2012-06-22 19:58:13 -07:00
Adam Powell
f3b653a21c
Update route count properly when MediaRouteButton detects
...
grouped/ungrouped events
Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
2012-06-22 19:22:38 -07:00
The Android Automerger
1f7611976d
merge in jb-release history after reset to jb-dev
2012-06-22 18:22:43 -07:00
Scott Main
a39d13c1be
docs: move NDK into Download section
...
Change-Id: I7c16b465c45ac4456f689ff81300f65f767acb12
2012-06-22 17:15:11 -07:00
Scott Main
fa54ba47f3
Merge "docs: change class names for links to design docs" into jb-dev
2012-06-22 17:01:03 -07:00
Hiroshi Lockheimer
3fee3eb7e0
am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev
...
* commit '5beeb04b528fec320d3453601b4adf4efbd8eba7':
Don't display based on a dummy animation.
2012-06-22 15:34:56 -07:00
Hiroshi Lockheimer
5beeb04b52
Merge "Don't display based on a dummy animation." into jb-dev
2012-06-22 15:33:15 -07:00
The Android Open Source Project
de9d2fb699
Reconcile with jb-release
...
Change-Id: I55842c8ce980d1a5ea7bb4dcb3eb7d8dd4c9dbac
2012-06-22 15:20:16 -07:00
Craig Mautner
9c5bf3b36f
Don't display based on a dummy animation.
...
The Starting window was being made visible early because the app
token had the dummy animation set. When the real animation started
the Starting window picked it up and became transparent causing
the underlying window to become visible again => jank.
Fixes bug 6691421.
Change-Id: I95fe88d2887760e6da3adedeb6be300eb6755283
2012-06-22 15:19:13 -07:00
The Android Automerger
b519fac279
merge in jb-release history after reset to jb-dev
2012-06-22 15:07:26 -07:00
Ying Wang
5539e720b4
am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89':
Import translations. DO NOT MERGE
2012-06-22 15:01:52 -07:00
Ying Wang
ddeb7bd3c7
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-22 14:58:39 -07:00
Michael Jurka
037faad0f4
am ab779e0b: Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev
...
* commit 'ab779e0bb2948bdfac461f931f9d165a5a38b84a':
Increase bitmap memory cap for widgets (Bug 6597440)
2012-06-22 14:39:52 -07:00
Michael Jurka
ab779e0bb2
Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev
2012-06-22 14:38:12 -07:00
Scott Main
91b5ecc486
docs: change class names for links to design docs
...
Change-Id: I34d85096eecb4e83f52e481411cf2f590d553a37
2012-06-22 14:37:27 -07:00
Jean-Baptiste Queru
cc6cf51b80
am 8c71784e: Merge "Initialize mJunkPath to false"
...
* commit '8c71784e9e83e914135e996591aa7903edd2fd96':
Initialize mJunkPath to false
2012-06-22 14:34:54 -07:00
Adam Powell
8a0f63bb58
am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev
...
* commit '40a9da3b9e5ae9d4d03b89f61f24ee6d96bd3bf4':
Allow sloppy touch targeting on Action Bar home/up
2012-06-22 14:28:26 -07:00
Adam Powell
40a9da3b9e
Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev
2012-06-22 14:26:20 -07:00
Winson Chung
e92aad432a
Increase bitmap memory cap for widgets (Bug 6597440)
...
Change-Id: I4149b8c5f204f10ebf0ef1f8d03709c0559178d0
2012-06-22 14:12:39 -07:00
Adam Powell
6231ab8bbb
Allow sloppy touch targeting on Action Bar home/up
...
Bug 6521608
When there are no custom views or other actionable views next to the
action bar's home/up affordance, expand the touch target by a generous
slop value. This helps frustrating cases where a user accidentally
hits just to the right of Up and nothing happens.
Change-Id: I09ef604ce70ad380aab62a373b04c4b02007c644
2012-06-22 14:09:25 -07:00
Jean-Baptiste Queru
8c71784e9e
Merge "Initialize mJunkPath to false"
2012-06-22 13:47:51 -07:00
Scott Main
101a120c27
am 9be0105f: docs: fix several links
...
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
docs: fix several links
2012-06-22 13:33:30 -07:00
Ying Wang
8f2acd0a2b
Import translations. DO NOT MERGE
...
Change-Id: Idcb453e08823c584fb0f748ebe46ed036046c9d4
2012-06-22 12:53:57 -07:00
Dianne Hackborn
357d99c61d
DO NOT MERGE Fix issue #6697105 : App launching sometimes has random pauses
...
In the course of the window manager refactoring into a separate
layout state, we introduced a bad interaction between the two
sides of the world. This resulting in multiple hops needed between
the two sides after an application has said it is finished drawing
its window, until the window/app transition is actually started.
Especially since these hops require going through the anim side
which is vsynced (so will delay its operation until the next frame),
this could introduce a notable delay until the window is first shown.
Fix this by re-arranging the code to make one straight path from
when a window reports it is shown to us starting the app transition
that is waiting for it. This change also includes various improvements
to debugging code that was done while working on it.
Change-Id: I7883674052da1a58df89cd1d9b8d754843cdd3db
2012-06-22 12:50:50 -07:00
The Android Open Source Project
6608279001
Reconcile with jb-release
...
Change-Id: Ibbea3fea4ef24b191309ae45a060b4190f1786ca
2012-06-22 12:37:09 -07:00
Scott Main
9be0105fbc
docs: fix several links
...
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
2012-06-22 12:35:08 -07:00
alanv
3a67eb3be4
Ensure screen reader URL gets updated during ICS to JB update.
...
Bug: 6702042
Change-Id: I771863c53fa420ba0746fce30cd17eb8b2b9fba1
2012-06-22 10:47:28 -07:00
Adam Powell
92a175ca6f
am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
...
* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
Avoid memory leak by only registering callback while attached to window.
2012-06-22 10:46:15 -07:00
Adam Powell
3cd4624448
Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
2012-06-22 10:44:27 -07:00
Dianne Hackborn
176a8a8b7c
am 0b9b053c: Merge "Don\'t crash in window manager if we fail getting .apk resources." into jb-dev
...
* commit '0b9b053ce6fdc48e922b6af37fe747b4ef40324a':
Don't crash in window manager if we fail getting .apk resources.
2012-06-22 10:40:53 -07:00
Dianne Hackborn
0b9b053ce6
Merge "Don't crash in window manager if we fail getting .apk resources." into jb-dev
2012-06-22 10:38:45 -07:00
The Android Automerger
34b5c470a6
merge in jb-release history after reset to jb-dev
2012-06-22 09:50:28 -07:00
The Android Open Source Project
b8e1319f0a
Reconcile with jb-release
...
Change-Id: Ie6dd6208c79b585db04f3e33902d25cad4ca36fc
2012-06-22 08:16:53 -07:00
Jack Palevich
101c449152
Avoid memory leak by only registering callback while attached to window.
...
Bug: 6710307
Change-Id: Idf57251e6feb48ec3e75e797144ff800fa874cc8
2012-06-22 16:06:57 +08:00
Scott Main
87cee816f9
am 50e990c6: Massive clobber of all HTML files in developer docs for new site design
...
* commit '50e990c64fa23ce94efa76b9e72df7f8ec3cee6a':
Massive clobber of all HTML files in developer docs for new site design
2012-06-21 21:30:29 -07:00
Scott Main
50e990c64f
Massive clobber of all HTML files in developer docs for new site design
...
Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3
2012-06-21 21:27:30 -07:00
Scott Main
7db989b305
am a2860267: update make file with \'since\' tag for api level 16, update version number
...
* commit 'a2860267cad115659018d636bf9203a644c680a7':
update make file with 'since' tag for api level 16, update version number
2012-06-21 21:24:10 -07:00
Scott Main
a2860267ca
update make file with 'since' tag for api level 16, update version number
...
Change-Id: I30d04dcde5cd505959d94c274634018b3602cb26
2012-06-21 21:20:42 -07:00
Adam Powell
9b5cdf4f14
am 4dd21c8e: Volume changes in MediaRouteChooserDialog
...
* commit '4dd21c8e77c0d369ee835f50cba1701e76aa18c4':
Volume changes in MediaRouteChooserDialog
2012-06-21 20:49:06 -07:00
Adam Powell
4dd21c8e77
Volume changes in MediaRouteChooserDialog
...
Use the max volume reported by the selected route as the max value to set.
Change-Id: I9848dfb201387843e7ed398ac61e2d13e14e3f51
2012-06-21 19:59:53 -07:00
Craig Mautner
a6b8189f8e
am 9ce1ea3a: Merge "Fix starting window problems." into jb-dev
...
* commit '9ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1':
Fix starting window problems.
2012-06-21 18:58:59 -07:00
Craig Mautner
9ce1ea3aa7
Merge "Fix starting window problems." into jb-dev
2012-06-21 18:56:27 -07:00
Craig Mautner
f412095686
Fix starting window problems.
...
Three problems fixed:
1. When one Activity took over for another Activity not all of the
starting window state was being copied over. Now copying over more
parameters.
2. When the visibility of an Activity was being changed the dummy
animation was overwriting the existing animation. If that animation
was the starting window animating then it started over when the
dummy animation was assigned. Now the dummy animation no longer
replaces an existing starting window animation.
3. The test for whether to animate away the starting window only
looked to see if the Activity had already drawn a window but did
not include the starting window. This caused the starting window
to immediately be hidden when the Activity was removed if no
windows were drawn, thereby exposing the fading window behind.
Now the starting window is included in the hasAppShownWindows test
and is animated away if it is exposed.
Fixes bug 6691421.
Change-Id: I4d32a1546c201652574a44d9e7f2752f1f1eb5a6
2012-06-21 18:25:39 -07:00