Commit Graph

691 Commits

Author SHA1 Message Date
Android (Google) Code Review
b3a72a9728 Merge change 1131 into donut
* changes:
  fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
2009-05-07 07:46:42 -07:00
Android (Google) Code Review
5a312bf26b am 90da134: Merge change 1065 into donut
Merge commit '90da134befec804852775be7fd4905a1a188ff00'

* commit '90da134befec804852775be7fd4905a1a188ff00':
  Add a contact placeholder picture.
2009-05-07 01:07:37 -07:00
Android (Google) Code Review
9ee6805503 Merge change 1065 into donut
* changes:
  Add a contact placeholder picture.
2009-05-07 01:05:41 -07:00
Michael Chan
837863eb93 am 05d24af: Merge branch \'readonly-p4-donut\' into donut
Merge commit '05d24afb61e2fbd137468a065fd58685e1a62d78'

* commit '05d24afb61e2fbd137468a065fd58685e1a62d78':
  AI 148368: Decrease CPU usage by throttling touch events
2009-05-06 18:18:49 -07:00
The Android Open Source Project
d046de9cc4 manual merge d90a331 to avoid conflicts
Merge commit 'd90a331'
2009-05-06 18:16:52 -07:00
Michael Chan
d42b9b7ca4 Merge branch 'readonly-p4-donut' into donut 2009-05-06 17:39:50 -07:00
Android (Google) Code Review
eda9f6f455 Merge change 1109
* changes:
  Another fix: look at db version to determine if there is a type column.
2009-05-06 17:21:57 -07:00
Android (Google) Code Review
857923db65 am 413cf5f: Merge change 1110 into donut
Merge commit '413cf5f4536b9c029d07f99b1c769c026313cd12'

* commit '413cf5f4536b9c029d07f99b1c769c026313cd12':
  Track install/removal/update of packages that provide backup services
2009-05-06 16:18:45 -07:00
Android (Google) Code Review
89620a0ae1 Merge change 1110 into donut
* changes:
  Track install/removal/update of packages that provide backup services
2009-05-06 16:15:21 -07:00
Android (Google) Code Review
1583e8b962 am f2331a6: Merge change 1063 into donut
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'

* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
  Refactor SearchableInfo.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
b266791625 am 729a901: Merge change 1099 into donut
Merge commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5'

* commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5':
  Fix Phone-based locale selection to never choose a lang-only locale.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
efad127cd3 am f759824: Merge change 1086 into donut
Merge commit 'f7598245489c6d28c2673acd269ada2e6e834065'

* commit 'f7598245489c6d28c2673acd269ada2e6e834065':
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 15:49:00 -07:00
Christopher Tate
e97296c9e7 am b1d790b: Pass null as savedState to indicate a full backup is require
Merge commit 'b1d790b63e2115be558d451efbc914d1f8dfa846'

* commit 'b1d790b63e2115be558d451efbc914d1f8dfa846':
  Pass null as savedState to indicate a full backup is required
2009-05-06 15:49:00 -07:00
Android (Google) Code Review
6518346f5e am 9a6f250: Merge change 1089 into donut
Merge commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c'

* commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c':
  Add a Backup Manager interface to request a full backup
2009-05-06 15:48:59 -07:00
Android (Google) Code Review
325a452960 am fd445d3: Merge change 1095 into donut
Merge commit 'fd445d3510cddc7a67cf7720935626684a2f3011'

* commit 'fd445d3510cddc7a67cf7720935626684a2f3011':
  gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 15:48:58 -07:00
The Android Open Source Project
f146b7f74c manual merge f3af740bdfc261b1cb25c0799af780d3753d4518
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
2009-05-06 15:48:33 -07:00
The Android Open Source Project
fbfaf9afdc manual merge for b9c9d260f21b321527c4622a123af9767630d94d
Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
2009-05-06 15:43:48 -07:00
Android (Google) Code Review
8d976746bb Merge change 1063 into donut
* changes:
  Refactor SearchableInfo.
2009-05-06 14:20:53 -07:00
Android (Google) Code Review
2b5154f4c3 Merge change 1099 into donut
* changes:
  Fix Phone-based locale selection to never choose a lang-only locale.
2009-05-06 14:06:08 -07:00
Android (Google) Code Review
ca4ae36063 Merge change 1086 into donut
* changes:
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 12:45:16 -07:00
Android (Google) Code Review
865ebd2926 Merge change 1089 into donut
* changes:
  Add a Backup Manager interface to request a full backup
2009-05-06 12:18:21 -07:00
Android (Google) Code Review
5cd6b2f8cf Merge change 1095 into donut
* changes:
  gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 11:58:27 -07:00
Android (Google) Code Review
3ef0d41f18 Merge change 1079
* changes:
  Fix [Issue 1835218]
2009-05-06 11:31:10 -07:00
Android (Google) Code Review
0c7792f06d Merge change 1058
* changes:
  Put three tests in ignore test list.
2009-05-06 10:56:45 -07:00
Android (Google) Code Review
6d9b24602e Merge change 1074
* changes:
  fix the sim build.  disables the tests for now.
2009-05-06 09:56:55 -07:00
Joe Onorato
081b070f6f fix the sim build. disables the tests for now. 2009-05-06 12:55:46 -04:00
Android (Google) Code Review
475f551ccd Merge change 645
* changes:
  Allow ViewStub to be used in AdapterView.setEmptyView() (bug 1803058)
2009-05-06 09:38:37 -07:00
Android (Google) Code Review
703b1bb125 am c770ed8: Merge change 1069 into donut
Merge commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95'

* commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95':
  GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
2009-05-06 08:20:03 -07:00
Android (Google) Code Review
7e6c468a20 Merge change 1069 into donut
* changes:
  GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
2009-05-06 08:06:35 -07:00
Tammo Spalink
b2659b8606 am d2b124f: new cdma sms unit tests (from QC on-site test)
Merge commit 'd2b124f97c52c566b68aff9fa58306f461686af0'

* commit 'd2b124f97c52c566b68aff9fa58306f461686af0':
  new cdma sms unit tests (from QC on-site test)
2009-05-06 01:31:33 -07:00
Android (Google) Code Review
eed7366734 am be3ac2d: Merge change 1040 into donut
Merge commit 'be3ac2d5ba8ef93c3cbf4d05edaf3434a14df2c9'

* commit 'be3ac2d5ba8ef93c3cbf4d05edaf3434a14df2c9':
  Add a test app for the backup
2009-05-06 01:31:32 -07:00
Android (Google) Code Review
a1bc294cf4 am 4488b11: Merge change 1039 into donut
Merge commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4'

* commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4':
  Add some C++ code to do raw files for backup
2009-05-06 01:31:32 -07:00
Android (Google) Code Review
359cfdc270 am e556248: Merge change 1017 into donut
Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24'

* commit 'e556248e859e7197d5f97c6c0724806d5913da24':
  Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
2009-05-06 01:31:31 -07:00
The Android Open Source Project
af49836c83 merge dccc39b to make automerger happy, original change 231cc6 was already merged
Merge commit 'dccc39b'
2009-05-06 01:27:30 -07:00
Dianne Hackborn
3cdd0158cd merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581 2009-05-06 00:28:37 -07:00
Android (Google) Code Review
9a4f01b6b0 Merge change 1040 into donut
* changes:
  Add a test app for the backup
2009-05-05 18:58:05 -07:00
Android (Google) Code Review
63f0227872 Merge change 1039 into donut
* changes:
  Add some C++ code to do raw files for backup
2009-05-05 18:58:01 -07:00
Android (Google) Code Review
186af05304 Merge change 1017 into donut
* changes:
  Changes in mediaframework test for the OpenCore 2.0 integration. Changes included: 1) The default value for the metatData 2) Add the videoSizedChange callback to get the video dimension Added the test cases for the async reset callback test case for the Qualcomm new realease.
2009-05-05 18:46:51 -07:00
Android (Google) Code Review
983f70bb80 am 3ed8b3d: Merge change 1018 into donut
Merge commit '3ed8b3dc42800068951332aea024f9737c25a0ed'

* commit '3ed8b3dc42800068951332aea024f9737c25a0ed':
  If no battery stats are found, return status_unknown
2009-05-05 16:18:25 -07:00
Android (Google) Code Review
759c92ff14 Merge change 777 into donut
* changes:
  Rewrite SyncStorageEngine to use flat files and in-memory data structures.
2009-05-05 16:17:25 -07:00
Android (Google) Code Review
40e18a1a53 Merge change 1018 into donut
* changes:
  If no battery stats are found, return status_unknown
2009-05-05 16:15:53 -07:00
Christopher Tate
f99f73c25f am f417247: Further development of backup file handling
Merge commit 'f417247fa68524f2f34960f7389168eed7eb4a88'

* commit 'f417247fa68524f2f34960f7389168eed7eb4a88':
  Further development of backup file handling
2009-05-05 16:14:39 -07:00
Android (Google) Code Review
e8b0399134 am 06d9602: Merge change 1000 into donut
Merge commit '06d96020c35dac2bf1651cb8bd4cfced911f1142'

* commit '06d96020c35dac2bf1651cb8bd4cfced911f1142':
  Ignore layout bin directories in git.
2009-05-05 13:47:39 -07:00
Joe Onorato
0c4863b266 Add some C++ code to do raw files for backup 2009-05-05 13:45:25 -07:00
Android (Google) Code Review
512ec5aae1 Merge change 1000 into donut
* changes:
  Ignore layout bin directories in git.
2009-05-05 13:45:05 -07:00
Scott Main
ffc18154cb am ad5aaea: am 0c11b99: AI 148308: revise aidl support documentation --
Merge commit 'ad5aaea2c5bda0a73c1bc0ae99f17f700e952907'

* commit 'ad5aaea2c5bda0a73c1bc0ae99f17f700e952907':
  AI 148308: revise aidl support documentation -- now the same in all environments;
2009-05-05 11:28:30 -07:00
Scott Main
951089d881 am 0c11b99: AI 148308: revise aidl support documentation -- now the same
Merge commit '0c11b990908df26aca7f017d330535b9bf21a903' into donut

* commit '0c11b990908df26aca7f017d330535b9bf21a903':
  AI 148308: revise aidl support documentation -- now the same in all environments;
2009-05-05 11:25:38 -07:00
Android (Google) Code Review
d957424a27 am 0c0221b: Merge change 972 into donut
Merge commit '0c0221b86b518630f8210060438bc31433e175f9'

* commit '0c0221b86b518630f8210060438bc31433e175f9':
  Back-merge all changes done in master to DumpRenderTree to donut.
2009-05-05 11:16:46 -07:00
Android (Google) Code Review
87fe31b422 Merge change 972 into donut
* changes:
  Back-merge all changes done in master to DumpRenderTree to donut.
2009-05-05 11:16:17 -07:00
Christopher Tate
0d15efcea3 am 22b8787: Squashed commit of the following:
Merge commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425'

* commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425':
  Squashed commit of the following:
2009-05-05 10:51:45 -07:00