Commit Graph

48132 Commits

Author SHA1 Message Date
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
Mathias Agopian
aa8c0ff7a3 get rid off unneeded flags 2009-05-05 18:29:35 -07:00
Mathias Agopian
58a79f4745 move android_native_buffer_t declaration into its own private/ui/android_native_priv.h header, since user code should never have access to it. 2009-05-05 18:21:32 -07:00
Mathias Agopian
7189c0054e move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h
the android_native_ types are just forward declared in egl.h
2009-05-05 18:11:11 -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
Android (Google) Code Review
041d84ffe2 Merge change 970
* changes:
  fix the bug of testStartupTime in MediaPlayerPerformance test throws exception for an existing table
2009-05-05 10:23:05 -07:00
Mathias Agopian
21c59d0070 get rid of android_native_buffer_t::getHandle() and replace it with an handle field
this abstraction was not necessary. things are easier now.
2009-05-05 00:59:23 -07:00
Mathias Agopian
e71212ba53 removed the "bits" attribute from android_native_buffer_t.
"bits" can never be trusted now that we need to call lock() on the handle to get the virtual address of the buffer.
2009-05-05 00:37:46 -07:00
Mathias Agopian
b2dd686d06 minor clean-up in FramebufferNativeWindow 2009-05-04 19:38:43 -07:00
Android (Google) Code Review
3023068549 am 6362741: Merge change 966 into donut
Merge commit '636274185ed5ee75faf6ef4d84bbb7d5b0371248'

* commit '636274185ed5ee75faf6ef4d84bbb7d5b0371248':
  Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
2009-05-04 17:57:06 -07:00
Android (Google) Code Review
79bd5b9f5c Merge change 966 into donut
* changes:
  Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
2009-05-04 17:54:39 -07:00
Android (Google) Code Review
f075b7a3a2 am 1ab6e21: Merge change 909 into donut
Merge commit '1ab6e21237fc9f436be002d4f3821fce963a0a2a'

* commit '1ab6e21237fc9f436be002d4f3821fce963a0a2a':
  Let screenOrientation="behind" works as expected
2009-05-04 17:20:31 -07:00
Android (Google) Code Review
b802c553c3 Merge change 909 into donut
* changes:
  Let screenOrientation="behind" works as expected
2009-05-04 17:19:06 -07:00
Android (Google) Code Review
6568de9639 am b7ce28c: Merge change 962 into donut
Merge commit 'b7ce28c64cc2f7250b02021f8a4cd3874155bee8'

* commit 'b7ce28c64cc2f7250b02021f8a4cd3874155bee8':
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.
2009-05-04 17:00:13 -07:00
Android (Google) Code Review
6583b308f9 Merge change 962 into donut
* changes:
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.
2009-05-04 16:59:12 -07:00