Scott Main
e9b4b3e94d
Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev
2012-06-25 12:31:11 -07:00
Scott Main
82e25bd59d
am dccd66f5: Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that\'s still relevant to some services" into jb-dev
...
* commit 'dccd66f5681c1372494da635b70242a7d535debc':
docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services
2012-06-25 12:00:06 -07:00
Scott Main
dccd66f568
Merge "docs: return the sdk terms doc to the site. needs to be revised, but for now offers some info that's still relevant to some services" into jb-dev
2012-06-25 11:57:09 -07:00
Scott Main
8ce79cc87a
docs: return the sdk terms doc to the site. needs to be revised,
...
but for now offers some info that's still relevant to some services
Change-Id: I689171ab81b7c47334d8dfa738be80e7eca4581a
2012-06-25 11:55:20 -07:00
Eric Fischer
764d1368d6
am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'c5fc8f5c1b97665d6b8b0a9d18d737f9fd2460f4':
Import translations. DO NOT MERGE
2012-06-25 11:34:58 -07:00
Eric Fischer
c5fc8f5c1b
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-25 11:32:30 -07:00
John Spurlock
988e6b7b13
TabletStatusBar: Lights-out shadow view should be taller
...
The lights-out shadow view is now the same height as the system bar.
This makes for a better looking animation (no cropping) and positions
the dots in the right place.
Bug: 6722791
Change-Id: Ifc2cc1586cd72a81a7bb801442be4fa4e03da2a5
2012-06-25 14:32:05 -04:00
Scott Main
97e0a1c6f3
docs: clean up javadoc code snippets, unescaped entities
...
Change-Id: Idc21caceccaaa2cc11a6c46b453b6a9b26164f34
2012-06-25 11:25:20 -07:00
Eric Fischer
d7e646d6d7
Import translations. DO NOT MERGE
...
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
2012-06-25 11:24:00 -07:00
Scott Main
2965b93d5e
am e40c4636: docs: move AIDL doc under Services in api guides.
...
* commit 'e40c4636d970c50f7719e7d5067963be93c25750':
docs: move AIDL doc under Services in api guides.
2012-06-25 10:45:50 -07:00
Scott Main
e40c4636d9
docs: move AIDL doc under Services in api guides.
...
Change-Id: I525de97958e2093af15cce2b007ec022cb315a71
2012-06-25 10:02:13 -07:00
The Android Open Source Project
95dca885cf
Reconcile with jb-release
...
Change-Id: I3dcf46b82ece74242207e8e3769a87dbe8f85a5f
2012-06-25 07:57:16 -07:00
John Spurlock
3623128d13
TabletStatusBar: Hide notifications during Setup Wizard
...
Protect tablet users going through the initial setup wizard from trapping
themselves in Settings before the setup wizard is complete. A similar change
was already made for phones, so use the same logic.
Also hide quick-settings button (another way to get trapped in Settings) and
associated panel click handler. Remove clear button since we're no longer
showing notification items.
Bug: 6704080
Change-Id: If7148cde9d18f493627f8367fd4b39d22e0d5ef1
2012-06-25 09:52:38 -04:00
Adam Powell
3c419da632
am dbbfa702: Fix MediaRouter bugs
...
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
Fix MediaRouter bugs
2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0
Fix MediaRouter bugs
...
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.
Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.
Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
2012-06-24 14:32:04 -07:00
Jeff Brown
780c46fc91
Don't wait until boot timeout if there is no wallpaper.
...
When launching only core apps, the wallpaper service
is not started. Without this change the WM waits
up to 30 seconds for the wallpaper window to be created even
though it will never happen. This introduces a significant
delay before the boot animation is dismissed so the user can
enter a decryption password.
Bug: 6263070
Change-Id: Ia975127a0bf09cf99818f7cc4fd6c0264b740ec6
2012-06-24 13:51:41 -07:00
Jeff Brown
08a746a0c6
Don't enable input dispatch until display enabled.
...
Bug: 6263070
Change-Id: I05d036fc1d9ec06d164d6743d45bb3f199cfab47
2012-06-24 12:23:58 -07:00
The Android Automerger
1e9aef5d94
merge in jb-release history after reset to jb-dev
2012-06-23 23:22:21 -07:00
Scott Main
1e546247b5
am 40a0376e: docs: remove unused id attribute from Button
...
* commit '40a0376ea5ac597d8df04fd3e4ad8bde7ac7c9ec':
docs: remove unused id attribute from Button
2012-06-23 17:02:40 -07:00
Scott Main
40a0376ea5
docs: remove unused id attribute from Button
...
Change-Id: Ia61c418972699d40757923fd69ea27b26eddaa05
2012-06-23 16:42:33 -07:00
Scott Main
0c51198806
am b0efc7fc: eat comment so it doesn\'t appear in docs
...
* commit 'b0efc7fce7967b043dae8896e8f9bf4d11274cf4':
eat comment so it doesn't appear in docs
2012-06-23 12:46:23 -07:00
Scott Main
b0efc7fce7
eat comment so it doesn't appear in docs
...
Change-Id: Id2b539fc80422edb32c86fa17ad888abbc48ba49
2012-06-23 12:36:17 -07:00
Dianne Hackborn
612ca9c6a5
Merge "Fix shutdown sequence to avoid SIGSEGV when running am command"
2012-06-23 12:03:51 -07:00
Scott Main
39aa4bbb98
am 067d64a9: docs: fix broken link
...
* commit '067d64a99a2ee90f250d81ee36d5a3efa056e5b5':
docs: fix broken link
2012-06-23 11:31:17 -07:00
Scott Main
067d64a99a
docs: fix broken link
...
Change-Id: Ia4ccab838e36b6e0e9298ed7222b5a581d3d5234
2012-06-23 11:27:20 -07:00
Jean-Baptiste Queru
695b2d089e
am 5f77f82e: Merge "Another case of extra ">""
...
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
Another case of extra ">"
2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b
am b8b47c22: Merge "Remove redundant ">""
...
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
Remove redundant ">"
2012-06-23 07:12:16 -07:00
Jean-Baptiste Queru
c34188a954
resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp
...
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
5f77f82e60
Merge "Another case of extra ">""
2012-06-23 05:59:11 -07:00
Jean-Baptiste Queru
b8b47c22c8
Merge "Remove redundant ">""
2012-06-23 05:58:56 -07:00
Jean-Baptiste Queru
f8f76d52a7
Merge "Add the possibility to modify the View focus rect"
2012-06-23 05:52:53 -07:00
Scott Main
0e61a72684
am 6f3e5e03: docs: remove ICS from developer hompage
...
* commit '6f3e5e03cf0affcf7d8761fe2ab58b8a1e91d177':
docs: remove ICS from developer hompage
2012-06-23 05:37:03 -07:00
Scott Main
9b7596e1cc
am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev
...
* commit '4708d8f54bc8908c158b8d6f591f9c132e572417':
docs: add jelly bean to homepage
2012-06-23 05:37:00 -07:00
Adam Powell
56fbd14f3d
am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog
...
* commit '1b4ea7eff50545f4673ca01b664e5edccc784688':
Sanity check while updating volume in MediaRouteChooserDialog
2012-06-23 05:36:58 -07:00
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