Elliott Hughes
79d95ac74e
Don't talk about Froyo as if it's still in the future.
...
Change-Id: I40c26a7a27459f7e8dd51c9f03fa860dee3a3a02
2012-07-16 15:30:53 -07:00
Romain Guy
13a3a87fa7
am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."
...
* commit 'dc99555d61d50820b398096bb774ee56b2500476':
Pass SearchView suggestion cursor exception to Log.
2012-07-06 23:52:55 -07:00
Romain Guy
dc99555d61
Merge "Pass SearchView suggestion cursor exception to Log."
2012-07-06 23:18:19 -07:00
Jake Wharton
73af451694
Pass SearchView suggestion cursor exception to Log.
...
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.
Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
2012-07-06 23:15:49 -07:00
Scott Main
d5f7d9b59d
am 15796e52: Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev
...
* commit '15796e52df1626ae27a6a88c6e905fd3b80868c9':
docs: add largeHeap attribute to app manifest doc external issue 33967
2012-07-03 19:41:56 -07:00
Scott Main
15796e52df
Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev
2012-07-03 19:39:26 -07:00
Scott Main
31f38d692c
am e469e74f: docs: new sitemap text file
...
* commit 'e469e74fd339efcfe88b56780f4380b0d1dd2ce8':
docs: new sitemap text file
2012-07-03 19:32:42 -07:00
Scott Main
e469e74fd3
docs: new sitemap text file
...
Change-Id: Ia28407054216997126873bb855d55c9caeeb05b4
2012-07-03 19:29:45 -07:00
Scott Main
01e1b832d7
docs: add largeHeap attribute to app manifest doc
...
external issue 33967
Change-Id: I69e5d3da78098842c4710708f4d389637dd0fe6b
2012-07-03 18:21:00 -07:00
Scott Main
480785dabb
am fd516987: docs: misc bugs from external tracker
...
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
docs: misc bugs from external tracker
2012-07-03 18:15:19 -07:00
Scott Main
fd516987de
docs: misc bugs from external tracker
...
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
2012-07-03 18:08:19 -07:00
Scott Main
7b5488d85d
am 099fd80f: docs: add throws notice for isPlaying per external issue 33610
...
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
docs: add throws notice for isPlaying per external issue 33610
2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98
docs: add throws notice for isPlaying
...
per external issue 33610
Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
2012-07-03 17:32:23 -07:00
Joe Malin
33715d1434
am 4c633ea6: Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev
...
* commit '4c633ea6f28711d168f690f7443c9523451bdbab':
DOC CHANGE: AOSP33968 Typo
2012-07-03 15:15:59 -07:00
Joe Malin
4c633ea6f2
Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev
2012-07-03 15:12:46 -07:00
Joe Malin
fd29e8a58f
DOC CHANGE: AOSP33968 Typo
...
Change-Id: I05de2666db6074c84caf540658aad96e6a4805d5
2012-07-03 14:34:16 -07:00
Joe Malin
14f84873c5
am 8d5efa6a: Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev
...
* commit '8d5efa6a8c68f53198b35d01ce64857ae1bf7946':
DOC CHANGE: AOSP 33831 - Typo
2012-07-03 14:27:28 -07:00
Joe Malin
8d5efa6a8c
Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev
2012-07-03 14:24:26 -07:00
Scott Main
da4b6db999
am 8ab2dfb2: Merge "docs: fix urls on homepage for offline docs" into jb-dev
...
* commit '8ab2dfb293133fa0033a1df9bcf7efb926b421d0':
docs: fix urls on homepage for offline docs
2012-07-03 14:12:27 -07:00
The Android Open Source Project
7e2f39043d
Reconcile with jb-release
...
Change-Id: I2bd087f75ee99d101e38d0e7b62d0aa701283107
2012-07-03 14:09:24 -07:00
Scott Main
8ab2dfb293
Merge "docs: fix urls on homepage for offline docs" into jb-dev
2012-07-03 14:09:17 -07:00
Joe Malin
67970e8aa0
DOC CHANGE: AOSP 33831 - Typo
...
Change-Id: I394fd5394baf9615463533157e06699478460ceb
2012-07-03 13:54:29 -07:00
Scott Main
88eee9972e
docs: fix urls on homepage for offline docs
...
Change-Id: Ifa1da094ee6482c7324ec5a8b50d245d505390b9
2012-07-03 13:19:45 -07:00
The Android Automerger
c292a619c7
merge in jb-release history after reset to jb-dev
2012-07-03 12:53:52 -07:00
Daniel Sandler
97270ce8ce
am 5d0c689b: Merge "Logs to track bug 6765842." into jb-dev
...
* commit '5d0c689b9b98be1b9be4d535ddb6f73142fd9b25':
Logs to track bug 6765842.
2012-07-03 12:12:35 -07:00
The Android Open Source Project
1a4f71b2d4
Reconcile with jb-release
...
Change-Id: Ic8cef33354ceb00868f939950089574353e76ce3
2012-07-03 12:11:48 -07:00
Daniel Sandler
5d0c689b9b
Merge "Logs to track bug 6765842." into jb-dev
2012-07-03 12:10:19 -07:00
Scott Main
7034ed833f
am 5a883824: Merge "docs: fix document issue 27549" into jb-dev
...
* commit '5a883824a2e97e0ccb08b4fe30accde6542f3f39':
docs: fix document issue 27549
2012-07-03 11:54:11 -07:00
Scott Main
5a883824a2
Merge "docs: fix document issue 27549" into jb-dev
2012-07-03 11:51:30 -07:00
Daniel Sandler
fdbac77e82
Logs to track bug 6765842.
...
It looks like we can get into a state where the notification
panel gets un-expanded, leaving an unsightly mess where your
status bar should be.
This change adds some additional info to the dumpsys output.
Bug: 6765842
Change-Id: Iecf2480bc7bdf5bb737863c0cbf9ad07d8523c0c
2012-07-03 14:35:05 -04:00
Scott Main
35cb0650c0
am 399df567: docs: various link fixes and other typos from external tracker
...
* commit '399df5677bd116a016664a10a0da432da29e829d':
docs: various link fixes and other typos from external tracker
2012-07-02 22:00:50 -07:00
Scott Main
15279cfc56
docs: fix document issue 27549
...
Change-Id: I17995fd70978657a46ccfc77fa2ae84c56a05255
2012-07-02 21:58:46 -07:00
Scott Main
399df5677b
docs: various link fixes and other typos from external tracker
...
Change-Id: I2a107f7e16429c0fe80c5e4cb67ecfaf267db301
2012-07-02 21:47:20 -07:00
The Android Automerger
6023c0d8d2
merge in jb-release history after reset to jb-dev
2012-07-02 18:59:51 -07:00
satok
cb31aa49aa
am f212878e: Merge "Update spell checking documents Bug: 6334194" into jb-dev
...
* commit 'f212878e3513b378eac622e5b03b0ac3aee91127':
Update spell checking documents Bug: 6334194
2012-07-02 18:29:58 -07:00
satok
f212878e35
Merge "Update spell checking documents Bug: 6334194" into jb-dev
2012-07-02 18:27:08 -07:00
Craig Mautner
c751e37c4f
am cc935071: Merge "DO NOT MERGE Set force hiding differently" into jb-dev
...
* commit 'cc93507124855591be40af55a94deeb33d74e719':
DO NOT MERGE Set force hiding differently
2012-07-02 17:22:40 -07:00
Craig Mautner
cc93507124
Merge "DO NOT MERGE Set force hiding differently" into jb-dev
2012-07-02 17:20:00 -07:00
Craig Mautner
80059d6c1b
am 00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev
...
* commit '00b9e899320488ff5623d8c80258ed7dfefc7b53':
Clear startingDisplayed flag when removing window.
2012-07-02 17:05:16 -07:00
Craig Mautner
00b9e89932
Merge "Clear startingDisplayed flag when removing window." into jb-dev
2012-07-02 17:01:58 -07:00
Craig Mautner
38b2478f63
Clear startingDisplayed flag when removing window.
...
The flag indicating that the Starting window is displayed was not
being cleared when the Starting window was removed. That caused the
goodToGo indication to falsely indicate that all windows were drawn
when in fact the destination activity had not yet been drawn. This
caused the animation to begin when it was still black behind the old
animation.
This fixes bug 6764727.
Change-Id: Iacef73b0335b9bde2cdc8d0b072034222cd728e8
2012-07-02 16:21:28 -07:00
The Android Automerger
dae5521fa3
merge in jb-release history after reset to jb-dev
2012-07-02 16:19:23 -07:00
Dirk Dougherty
e102b8168a
am 4123b46f: Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev
...
* commit '4123b46f0e4146cb181b53af476e34bfede7d1ec':
Doc change: updated numbers for Andriod. Fix gcm image path.
2012-07-02 15:59:26 -07:00
Dirk Dougherty
4123b46f0e
Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev
2012-07-02 15:56:49 -07:00
Dirk Dougherty
24a3242029
Doc change: updated numbers for Andriod. Fix gcm image path.
...
Change-Id: Ia3b43f9464938b9775ee6f77c850af37fac9117f
2012-07-02 15:52:25 -07:00
Jean-Baptiste Queru
e39d42db00
Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp
2012-07-02 14:48:48 -07:00
Jean-Baptiste Queru
5709f43dd8
Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp
2012-07-02 14:48:44 -07:00
Jean-Baptiste Queru
3cd92d8faa
Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp
2012-07-02 14:48:38 -07:00
Jean-Baptiste Queru
df0dded1e7
Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp
2012-07-02 14:48:33 -07:00
Jean-Baptiste Queru
2a2d5e0b31
Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp
2012-07-02 14:48:28 -07:00