Commit Graph

910 Commits

Author SHA1 Message Date
Dianne Hackborn
b481a59275 am b2d41569: Fix build.
Merge commit 'b2d415693482f58e104a99376cc4f65bf3799edf'

* commit 'b2d415693482f58e104a99376cc4f65bf3799edf':
  Fix build.
2009-05-20 08:54:35 -07:00
Dianne Hackborn
985a59a2de am 95fc68f2: Fix issue where apps could prevent the user from going home.
Merge commit '95fc68f24a2a93e5664e2234abcfe479d385cc05'

* commit '95fc68f24a2a93e5664e2234abcfe479d385cc05':
  Fix issue where apps could prevent the user from going home.
2009-05-20 08:54:33 -07:00
Jaikumar Ganesh
0a85bc40ee am ee748d37: Fix network preference getting incorrectly set.
Merge commit 'ee748d37b01b3affb72b701d95ba20c189887b5f'

* commit 'ee748d37b01b3affb72b701d95ba20c189887b5f':
  Fix network preference getting incorrectly set.
2009-05-19 17:36:59 -07:00
Android (Google) Code Review
b1d35e9a44 am 83a6ec60: Merge change 1791 into donut
Merge commit '83a6ec600259d245b799a99a8e963704db031a63'

* commit '83a6ec600259d245b799a99a8e963704db031a63':
  Add a method to get the PhoneType in CellLocation.
2009-05-19 17:20:07 -07:00
Android (Google) Code Review
152503b31e Merge change 1791 into donut
* changes:
  Add a method to get the PhoneType in CellLocation.
2009-05-19 17:19:21 -07:00
Android (Google) Code Review
64cd79fc99 am eba1ffb1: Merge change 2022 into donut
Merge commit 'eba1ffb1468ce348bcd55a2d200728d5ac3b1eb3'

* commit 'eba1ffb1468ce348bcd55a2d200728d5ac3b1eb3':
  TextView was not setting the callback on its compound drawables, thus preventing them from refreshing the view when updating their internal state. This would for instance prevent animated drawables from actually animating. Quite infuriating.
2009-05-19 16:54:25 -07:00
Android (Google) Code Review
2a85fb3e6b Merge change 2022 into donut
* changes:
  TextView was not setting the callback on its compound drawables, thus preventing them from refreshing the view when updating their internal state. This would for instance prevent animated drawables from actually animating. Quite infuriating.
2009-05-19 16:52:41 -07:00
Android (Google) Code Review
dc1bdfdb93 am 379d3bd9: Merge change 2016 into donut
Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9'

* commit '379d3bd974cfde9480fda733d4f442311924cbb9':
  Replaced the old test media files with the new open source test media files.
2009-05-19 16:52:31 -07:00
Android (Google) Code Review
8300fd5b09 am f9df6bd6: Merge change 1878 into donut
Merge commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180'

* commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180':
  Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
2009-05-19 16:52:26 -07:00
Android (Google) Code Review
5b88a4f624 Merge change 2016 into donut
* changes:
  Replaced the old test media files with the new open source test media files. Fix the bug in testGetThumbnail test.
2009-05-19 16:51:29 -07:00
Android (Google) Code Review
7ba0b4c0e2 Merge change 1878 into donut
* changes:
  Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
2009-05-19 16:51:28 -07:00
Android (Google) Code Review
e741845ebe am 988c4d1a: Merge change 2005 into donut
Merge commit '988c4d1a3ece97c078658a67b15949db900641e0'

* commit '988c4d1a3ece97c078658a67b15949db900641e0':
  Added the write sdcard permission so that the mediarecorder test
2009-05-19 15:22:35 -07:00
Android (Google) Code Review
6ff0ca504e Merge change 2005 into donut
* changes:
  Added the write sdcard permission so that the mediarecorder test can write the new recorded video into sdcard.
2009-05-19 15:21:35 -07:00
San Mehat
973858d1c2 am 3e458241: process: Add setProcessGroup() hidden API call to set the cgroup of a process and all its child threads.
Merge commit '3e458241d9930465a20a861ecb42744355d48e48'

* commit '3e458241d9930465a20a861ecb42744355d48e48':
  process: Add setProcessGroup() hidden API call to set the cgroup of
2009-05-19 15:01:47 -07:00
Android (Google) Code Review
81c2b131f5 am 65ff54c4: Merge change 1967 into donut
Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9'

* commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9':
  Document the media scanner's flow through native and java code, since
2009-05-19 14:04:04 -07:00
Android (Google) Code Review
4efba7e4b4 Merge change 1967 into donut
* changes:
  Document the media scanner's flow through native and java code, since I always forget how it works after a while.
2009-05-19 12:03:47 -07:00
Android (Google) Code Review
e004dc2e95 am f313b59b: Merge change 1957 into donut
Merge commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e'

* commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e':
  Settings: Disable network location service by default, enable GPS instead.
2009-05-19 11:16:24 -07:00
Mike Lockwood
56e8ea1cd2 am ac61f6bc: Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION
Merge commit 'ac61f6bc2b24f7ab03cdb0089c67c4034ea8549c'

* commit 'ac61f6bc2b24f7ab03cdb0089c67c4034ea8549c':
  Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION
2009-05-19 11:16:24 -07:00
Android (Google) Code Review
7f068cb1f6 Merge change 1957 into donut
* changes:
  Settings: Disable network location service by default, enable GPS instead.
2009-05-19 11:15:50 -07:00
Android (Google) Code Review
4032d5fade Merge change 1902
* changes:
  Throttle one last user activity call to 1/sec that was missed last time
2009-05-19 10:52:40 -07:00
Android (Google) Code Review
0a2188b67e am 12bb9471: Merge change 1936 into donut
Merge commit '12bb9471cb9ce2eb48d8e9817841f43e7220566f'

* commit '12bb9471cb9ce2eb48d8e9817841f43e7220566f':
  Recovered the code of the gesture library
2009-05-19 10:33:57 -07:00
Android (Google) Code Review
4ff6fe7638 Merge change 1936 into donut
* changes:
  Recovered the code of the gesture library
2009-05-19 10:32:01 -07:00
Mihai Preda
d38e88eff3 am c3320dbe: Minor performance improvement when filtering intents by package.
Merge commit 'c3320dbe1c7acf040a3ec895129d8aae09c570ea'

* commit 'c3320dbe1c7acf040a3ec895129d8aae09c570ea':
  Minor performance improvement when filtering intents by package.
2009-05-19 05:19:50 -07:00
Bjorn Bringert
9130def32c am 5615d35b: Add tests for the new SQLite _TOKENIZE() \'tag\' column.
Merge commit '5615d35b28119865cd65a79814a69f910e0a3862'

* commit '5615d35b28119865cd65a79814a69f910e0a3862':
  Add tests for the new SQLite _TOKENIZE() 'tag' column.
2009-05-19 02:41:40 -07:00
Scott Main
58082e49ac am 51b22d74: am 221c9552: AI 148972: fix link to the installing guide to 1.5; fix a couple layout bugs in the document. BUG=1860640
Merge commit '51b22d74a39ef7f6a3684a36bb48ace523e83413'

* commit '51b22d74a39ef7f6a3684a36bb48ace523e83413':
  AI 148972: fix link to the installing guide to 1.5;
2009-05-19 01:19:23 -07:00
Ramanan Rajeswaran
23c5fe8474 am 3975fe3f: am 808f2919: AI 148962: Default language in Switzerland should be german and not english.
Merge commit '3975fe3f21311e41b41e3a3e234a45ca24bed521'

* commit '3975fe3f21311e41b41e3a3e234a45ca24bed521':
  AI 148962: Default language in Switzerland should be german and not english.
2009-05-19 01:19:23 -07:00
Android (Google) Code Review
db23e56bd8 am 2f11599e: Merge change 1579 into donut
Merge commit '2f11599eb317887a8cca14d8e66bfc485e5169e7'

* commit '2f11599eb317887a8cca14d8e66bfc485e5169e7':
  Teleca 2b changes
2009-05-19 01:19:18 -07:00
Android (Google) Code Review
812ad82b4d am 15e74b9d: Merge change 1939 into donut
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'

* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
  Fix build breakage
  Revise the ImageButton class description to include information
  Record statistics about whether HTTP connections are reused.
2009-05-19 01:19:15 -07:00
The Android Open Source Project
bc5fd232ae Merge commit '842a1f4b0beaacfaab940318fe19909e087aae81' 2009-05-19 01:17:36 -07:00
Android (Google) Code Review
0087559964 am 656a2726: Merge change 1910 into donut
Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'

* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
  Update aapt badging for native code, configs, density, etc.
2009-05-18 23:56:07 -07:00
Android (Google) Code Review
9578ca1480 am 1058c63b: Merge change 1909 into donut
Merge commit '1058c63b262c838a57301fde59b04c9fa0ee1fdc'

* commit '1058c63b262c838a57301fde59b04c9fa0ee1fdc':
  Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
2009-05-18 23:56:07 -07:00
Jeff Sharkey
51d095e32a am af999280: Change BIND_APPWIDGET to be signatureOrSystem.
Merge commit 'af9992802992aaccfe1fb5893448939f215dd607'

* commit 'af9992802992aaccfe1fb5893448939f215dd607':
  Change BIND_APPWIDGET to be signatureOrSystem.
2009-05-18 23:56:06 -07:00
Android (Google) Code Review
1e52804be2 am 6c256545: Merge change 1899 into donut
Merge commit '6c25654573e45fa012078caef0a493c056cc0a26'

* commit '6c25654573e45fa012078caef0a493c056cc0a26':
  Fix the build
2009-05-18 23:56:04 -07:00
Scott Main
d03e95a960 am 221c9552: AI 148972: fix link to the installing guide to 1.5; fix a couple layout bugs in the document. BUG=1860640
Merge commit '221c95526d3e3e23288478b6dd2d24b5ec7e97d5' into donut

* commit '221c95526d3e3e23288478b6dd2d24b5ec7e97d5':
  AI 148972: fix link to the installing guide to 1.5;
2009-05-18 23:25:10 -07:00
Ramanan Rajeswaran
9db44f915a am 808f2919: AI 148962: Default language in Switzerland should be german and not english.
Merge commit '808f2919ee9cd9ff678ef091da0c7b703c929003' into donut

* commit '808f2919ee9cd9ff678ef091da0c7b703c929003':
  AI 148962: Default language in Switzerland should be german and not english.
2009-05-18 23:25:04 -07:00
Android (Google) Code Review
10ab98abc8 Merge change 1579 into donut
* changes:
  Teleca 2b changes
2009-05-18 22:26:25 -07:00
Android (Google) Code Review
9a895f9d0b Merge change 1939 into donut
* changes:
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
2009-05-18 19:34:33 -07:00
Android (Google) Code Review
dab6dd77c5 Merge change 1916 into donut
* changes:
  Revise the ImageButton class description to include information about XML <selector> drawables, for managing button state.
2009-05-18 17:03:24 -07:00
Android (Google) Code Review
2983fe8382 Merge change 1927 into donut
* changes:
  Fix build breakage
2009-05-18 16:56:56 -07:00
Android (Google) Code Review
090293c2ae Merge change 1891 into donut
* changes:
  Record statistics about whether HTTP connections are reused.
2009-05-18 16:51:53 -07:00
Android (Google) Code Review
b71dbe1c69 Merge change 1912 into donut
* changes:
  Hand merge from cupcake_dcm to donut, part 2.
2009-05-18 16:29:27 -07:00
Android (Google) Code Review
f57bf2f9d1 Merge change 1910 into donut
* changes:
  Update aapt badging for native code, configs, density, etc.
2009-05-18 15:38:34 -07:00
Dianne Hackborn
7a57985962 Update aapt badging for native code, configs, density, etc. 2009-05-18 15:22:00 -07:00
Android (Google) Code Review
43871dcd4f Merge change 1909 into donut
* changes:
  Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
2009-05-18 15:18:17 -07:00
Android (Google) Code Review
38f4e59f18 Merge change 1899 into donut
* changes:
  Fix the build
2009-05-18 14:12:22 -07:00
Android (Google) Code Review
e4c64a1a9f am a0068514: Merge change 1894 into donut
Merge commit 'a0068514e7c60252a96fa7907ff976bef46b4c40'

* commit 'a0068514e7c60252a96fa7907ff976bef46b4c40':
  libGLESv1_CM.so doesn't need to depend on libutils or libui
2009-05-18 14:09:00 -07:00
Android (Google) Code Review
b1c164fa79 Merge change 1894 into donut
* changes:
  libGLESv1_CM.so doesn't need to depend on libutils or libui
2009-05-18 14:07:21 -07:00
Romain Guy
4c9441b724 am 9da06a4e: Fixes external #2686. Fix typo.
Merge commit '9da06a4e2e16c3cd59720cf7848500683a48ed5a'

* commit '9da06a4e2e16c3cd59720cf7848500683a48ed5a':
  Fixes external #2686. Fix typo.
2009-05-18 14:02:14 -07:00
The Android Open Source Project
64b727140c merge 9a7773a450e384bbc87b0204f9f0e49ec48de879 w/conflicts 2009-05-18 14:00:41 -07:00
Android (Google) Code Review
176b804dda Merge change 1875 into donut
* changes:
  Fixes external #2669. Clarify the documentation of the XML attributes android:gravity and android:layout_gravity.
2009-05-18 13:52:06 -07:00