Commit Graph

14553 Commits

Author SHA1 Message Date
Android (Google) Code Review
fb5982967e am 3674252: Merge change 817 into donut
Merge commit '36742528f89fd13e65c8652cc684cffc9e97b567'

* commit '36742528f89fd13e65c8652cc684cffc9e97b567':
  Hide the backup stuff for now
2009-04-30 13:14:48 -07:00
Android (Google) Code Review
a819e505e2 Merge change 817 into donut
* changes:
  Hide the backup stuff for now
2009-04-30 12:43:33 -07:00
Mike Lockwood
218d125d46 am c21a08f: gps: Fix missing return value in android_location_GpsLocatio
Merge commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0'

* commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0':
  gps: Fix missing return value in android_location_GpsLocationProvider_init
2009-04-30 12:34:13 -07:00
Android (Google) Code Review
44a8abba6f am 021dce4: Merge change 811 into donut
Merge commit '021dce4198afbf602109ba5807a193c437b05361'

* commit '021dce4198afbf602109ba5807a193c437b05361':
  Add android.backup.BackupManager
2009-04-30 12:34:10 -07:00
Android (Google) Code Review
1bd1e31c76 Merge change 811 into donut
* changes:
  Add android.backup.BackupManager
2009-04-30 11:38:54 -07:00
Android (Google) Code Review
36f6524de7 am a039d46: Merge change 792 into donut
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'

* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
  Allow access to global search by pressing the hard search button again
2009-04-30 11:00:07 -07:00
Android (Google) Code Review
75c16b9a24 Merge change 792 into donut
* changes:
  Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
2009-04-30 10:07:39 -07:00
android-build SharedAccount
9d8504e30b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-04-30 00:26:40 -07:00
Dan Bornstein
8c01c4787a am 5fcfcd0: am b4c218e: AI 147994: First cut of CharsetUtils, a utility
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'

* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
  AI 147994: First cut of CharsetUtils, a utility class that aims to
2009-04-30 00:02:27 -07:00
Dan Bornstein
1223a0077f am b4c218e: AI 147994: First cut of CharsetUtils, a utility class that a
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut

* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
  AI 147994: First cut of CharsetUtils, a utility class that aims to
2009-04-29 23:31:38 -07:00
Mitsuru Oshima
e71b71736a am d4ed049: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'

* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
  AI 148024: fix NPE when there is no history
2009-04-29 23:20:11 -07:00
Mitsuru Oshima
a6da57cbe2 Merge branch 'readonly-p4-donut' into donut 2009-04-29 17:15:14 -07:00
Android (Google) Code Review
4c86c221f0 am 7fe3b06: Merge change 740 into donut
Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2'

* commit '7fe3b064d3645fcebd09b162c5989e0d702112e2':
  MIDI render thread was nice 0, should be nice -16.
2009-04-29 15:43:34 -07:00
Android (Google) Code Review
56f383ce68 Merge change 740 into donut
* changes:
  MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
2009-04-29 15:27:15 -07:00
Christopher Tate
38afcfd8d6 am 487529a: First baby steps towards settings backup
Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185'

* commit '487529a70cd1479ae8d6bbfb356be7e72542c185':
  First baby steps towards settings backup
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
5d3d8df804 am dc67739: Merge change 741 into donut
Merge commit 'dc67739af90aa31a0b546c14bf1e68e6acbb8375'

* commit 'dc67739af90aa31a0b546c14bf1e68e6acbb8375':
  Fix typo in searchSuggestThreshold attr doc.
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
d0f2358492 am 73b7184: Merge change 748 into donut
Merge commit '73b71842dc9c943d69ce28212776ce671e54bcdb'

* commit '73b71842dc9c943d69ce28212776ce671e54bcdb':
  Fix the build.
2009-04-29 15:16:52 -07:00
The Android Open Source Project
c1717c0142 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-04-29 15:16:52 -07:00
Android (Google) Code Review
04a255ea14 Merge change 711
* changes:
  store contact id in messages table instead of contact name string; merge messages and group messages tables.
2009-04-29 14:32:10 -07:00
Android (Google) Code Review
3977565ae6 Merge change 741 into donut
* changes:
  Fix typo in searchSuggestThreshold attr doc.
2009-04-29 14:30:27 -07:00
Android (Google) Code Review
bc41830139 Merge change 748 into donut
* changes:
  Fix the build.
2009-04-29 13:51:33 -07:00
Android (Google) Code Review
75bd859bf1 am 9ae8873: Merge change 617 into donut
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'

* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
  Allow caller-supplied column aliases in queries even when a projection map is used.
2009-04-29 13:41:23 -07:00
Android (Google) Code Review
968b01a443 am 9f98f79: Merge change 739 into donut
Merge commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a'

* commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a':
  Vorbis render thread was nice 0, should be nice -16.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
1124e2a707 am 649b1c6: Merge change 736 into donut
Merge commit '649b1c6ec317b6dd61a385df911e7fe543c5871a'

* commit '649b1c6ec317b6dd61a385df911e7fe543c5871a':
  CheckedTextView is abstract but can be inflated from XML. Let's be consistent and allow it to be used from Java code as well by making it non-abstract.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
e4360486e4 am efae672: Merge change 725 into donut
Merge commit 'efae672d7303fb6682b2ae8704a62146297a0a5a'

* commit 'efae672d7303fb6682b2ae8704a62146297a0a5a':
  Add 'includeInGlobalSearch' attribute to searchable meta-data.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
475285b4d3 am 05e4755: Merge change 724 into donut
Merge commit '05e47550bb5bcd7cff10b03c8da31e5b55ee4c91'

* commit '05e47550bb5bcd7cff10b03c8da31e5b55ee4c91':
  Split testSearchablesMocked into two tests.
2009-04-29 13:41:21 -07:00
Bjorn Bringert
d091752366 am c1f4096: Remove menu from SearchDialog.
Merge commit 'c1f40960644b461b108480b6446c89963441492d'

* commit 'c1f40960644b461b108480b6446c89963441492d':
  Remove menu from SearchDialog.
2009-04-29 13:41:21 -07:00
Android (Google) Code Review
08b3fe7d60 am 80f3b97: Merge change 730 into donut
Merge commit '80f3b97121477e9ed62193c038772b4d020534df'

* commit '80f3b97121477e9ed62193c038772b4d020534df':
  New font that fixes the accent shape/orientation on 1EDD
2009-04-29 13:41:21 -07:00
Android (Google) Code Review
aa470f66b8 am c5f1b92: Merge change 691 into donut
Merge commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3'

* commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3':
  Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.
2009-04-29 13:41:21 -07:00
The Android Open Source Project
fca69a60af am 203464a: Add searchSuggestThreshold to searchable meta-data. 2009-04-29 13:40:03 -07:00
Android (Google) Code Review
6caf985cb8 am 493b00a: Merge change 640 into donut
Merge commit '493b00afbfd4f603939ee98540a4d8df084107fd'

* commit '493b00afbfd4f603939ee98540a4d8df084107fd':
  Add GLOBAL_SEARCH intent for finding global search provider.
2009-04-29 13:35:48 -07:00
Eric Fischer
c0e15226d1 am 7ffeac8: am a21e376: AI 147962: Import updated zh_TW translations.
Merge commit '7ffeac8db927c0179a9d24d20dbbb49087e604cc'

* commit '7ffeac8db927c0179a9d24d20dbbb49087e604cc':
  AI 147962: Import updated zh_TW translations.
2009-04-29 13:35:48 -07:00
Scott Main
3313fce9fe am c13fe2c: am c804836: AI 147951: delete unused files
Merge commit 'c13fe2c00b05dfdf3b5ee220ab0327358ed04081'

* commit 'c13fe2c00b05dfdf3b5ee220ab0327358ed04081':
  AI 147951: delete unused files
2009-04-29 13:35:47 -07:00
Scott Main
a897ec2b46 am b2b841d: am 998234e: AI 147947: update the sitemap. add disallow in r
Merge commit 'b2b841db08057a6dbc86f99fd35106ed741da126'

* commit 'b2b841db08057a6dbc86f99fd35106ed741da126':
  AI 147947: update the sitemap. add disallow in robots file for the sdk/preview/
2009-04-29 13:35:47 -07:00
Dirk Dougherty
cb8bf9e1a1 am 0b8c4fa: am 752aaf9: AI 147874: Fix format and link errors in docs.
Merge commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624'

* commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624':
  AI 147874: Fix format and link errors in docs.
2009-04-29 13:35:47 -07:00
Scott Main
f7f93173fc am 9eb6ac8: am 5fe696f: AI 147814: tweaks to the hello world tutorial.
Merge commit '9eb6ac878e47ba5340896cab10ac17e269b518d1'

* commit '9eb6ac878e47ba5340896cab10ac17e269b518d1':
  AI 147814: tweaks to the hello world tutorial.
2009-04-29 13:35:46 -07:00
Scott Main
b6914d27a9 am 563dc08: am 2222c9e: AI 147812: close <em> tag
Merge commit '563dc08ec0d80d60926ec27385733bfe4c8c5ee2'

* commit '563dc08ec0d80d60926ec27385733bfe4c8c5ee2':
  AI 147812: close <em> tag
2009-04-29 13:35:46 -07:00
Scott Main
eb058060dd am dfe88ae: am 0ee4f86: AI 147811: typo fixes and edits for upgrading an
Merge commit 'dfe88ae496494fb95782e3c028a53069e951f89e'

* commit 'dfe88ae496494fb95782e3c028a53069e951f89e':
  AI 147811: typo fixes and edits for upgrading and installing docs
2009-04-29 13:35:45 -07:00
Scott Main
4a421bbb9a am 7e35614: am 263ed76: AI 147810: fix links on the homepage
Merge commit '7e35614162d0da1e2949a28d9c87f76a4c77877d'

* commit '7e35614162d0da1e2949a28d9c87f76a4c77877d':
  AI 147810: fix links on the homepage
2009-04-29 13:35:45 -07:00
Dirk Dougherty
332f9b846c am db24820: am 7eeb5d5: AI 147807: Miscellaneous doc fixes needed for 1.
Merge commit 'db248204f05a94a973f6de9983e594a779fdb366'

* commit 'db248204f05a94a973f6de9983e594a779fdb366':
  AI 147807: Miscellaneous doc fixes needed for 1.5 SDK push
2009-04-29 13:35:45 -07:00
Scott Main
f45da909be am 323d821: am ce878be: AI 147804: add new doc about Dialogs
Merge commit '323d82130c440b3f2327916a42eed1f1b2b1592f'

* commit '323d82130c440b3f2327916a42eed1f1b2b1592f':
  AI 147804: add new doc about Dialogs
2009-04-29 13:35:44 -07:00
Scott Main
9c3b1cb5b4 am 8419fcd: am b8b3645: AI 147803: add docs and images for docs on Toast
Merge commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4'

* commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4':
  AI 147803: add docs and images for docs on Toast and  Notification docs
2009-04-29 13:35:44 -07:00
Dirk Dougherty
64941c1f36 am bce7bc9: am 596451c: AI 147796: Add widget design guidelines to new U
Merge commit 'bce7bc9286d1f470b6d141b058d5df47261827a8'

* commit 'bce7bc9286d1f470b6d141b058d5df47261827a8':
  AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
2009-04-29 13:35:44 -07:00
Scott Main
a3b50d150a am 856d015: am 6fc27f7: AI 147793: cleanup broken links and delete all i
Merge commit '856d0150da8dffbadd17e9853bcf0847c030b9c9'

* commit '856d0150da8dffbadd17e9853bcf0847c030b9c9':
  AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
2009-04-29 13:35:43 -07:00
Dirk Dougherty
bb4e6f7e06 am cbf17dd: am 47f3a7a: AI 147782: Add a link to the JET docs from media
Merge commit 'cbf17dd673f8e2519f435748fad1eeb2b7a7fd54'

* commit 'cbf17dd673f8e2519f435748fad1eeb2b7a7fd54':
  AI 147782: Add a link to the JET docs from media index page.
2009-04-29 13:35:43 -07:00
Scott Main
da468ecfc4 am 0db2557: am 4afe275: AI 147780: add summary of "future-proofing your
Merge commit '0db255749155f8f56790e6683501c3d4276c915c'

* commit '0db255749155f8f56790e6683501c3d4276c915c':
  AI 147780: add summary of "future-proofing your apps" and links
2009-04-29 13:35:43 -07:00
Scott Main
f60ec445b6 am 6585cc1: am 094d9af: AI 147777: add release notes links for each down
Merge commit '6585cc1bbdc49bed71d0e5ca7b9f86849a5a8b97'

* commit '6585cc1bbdc49bed71d0e5ca7b9f86849a5a8b97':
  AI 147777: add release notes links for each download page
2009-04-29 13:35:42 -07:00
Scott Main
f9ab6bce7e am 5e8ead2: am 6bbf389: AI 147767: set 1.1 download page to include "not
Merge commit '5e8ead2647f37015f8265a4d7e8d99debdb852b3'

* commit '5e8ead2647f37015f8265a4d7e8d99debdb852b3':
  AI 147767: set 1.1 download page to include "not current" disclaimer
2009-04-29 13:35:42 -07:00
Dirk Dougherty
836f1a791e am d41f950: am 7b54237: AI 147755: Add sizes and checksums for 1.5 SDK d
Merge commit 'd41f950acad2d70e3df243d49cf8ba725b7cd1de'

* commit 'd41f950acad2d70e3df243d49cf8ba725b7cd1de':
  AI 147755: Add sizes and checksums for 1.5 SDK downloadables.
2009-04-29 13:35:42 -07:00
Scott Main
44b56decb5 am 4681c01: am 6f1826c: AI 147752: dang, there was another unclosed tag.
Merge commit '4681c017a1af9cec99a0ad699a59c701f0424816'

* commit '4681c017a1af9cec99a0ad699a59c701f0424816':
  AI 147752: dang, there was another unclosed tag... tested it this time.
2009-04-29 13:35:42 -07:00