1993 Commits

Author SHA1 Message Date
Android (Google) Code Review
6f3cbac7eb 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
65ff54c44b 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
fd38b81dca 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
02436e5182 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
f313b59b4f Merge change 1957 into donut
* changes:
  Settings: Disable network location service by default, enable GPS instead.
2009-05-19 11:15:50 -07:00
Mike Lockwood
ac61f6bc2b Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION
ACCESS_FINE_LOCATION should imply ACCESS_COARSE_LOCATION, so either of these
permissions should be sufficient to allow TelephonyManager.getCellLocation().

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-19 13:53:24 -04:00
Android (Google) Code Review
55cf0cacc6 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
93a19f77f5 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
12bb9471cb Merge change 1936 into donut
* changes:
  Recovered the code of the gesture library
2009-05-19 10:32:01 -07:00
Marco Nelissen
77f2c4c1f9 Document the media scanner's flow through native and java code, since
I always forget how it works after a while.
2009-05-19 10:00:33 -07:00
Michael Chan
e10de97205 Throttle one last user activity call to 1/sec that was missed last time
modified:   services/java/com/android/server/WindowManagerService.java
2009-05-19 09:51:33 -07:00
Daisuke Miyakawa
72f3aa3762 Fix a bug in AbstractSyncableContentProvider.java and modify comments. 2009-05-20 01:39:14 +09:00
Daisuke Miyakawa
7c3e18c558 resolved conflicts w/ 842a1f4b0beaacfaab940318fe19909e087aae81 merge.... 2009-05-19 23:13:14 +09:00
Mihai Preda
e249059a66 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
Mihai Preda
c3320dbe1c Minor performance improvement when filtering intents by package.
Don't consider the activities that have no intent filters.
2009-05-19 14:15:14 +02:00
Mike Lockwood
79a6b3b449 Settings: Disable network location service by default, enable GPS instead.
Network Location Provider requires user opt-in, so it should be disabled by default
and only enabled if the user agrees to the terms of service and privacy policy.
Use GPS as default location provider instead.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-19 07:57:58 -04:00
Bjorn Bringert
7ca4a171d2 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
Bjorn Bringert
5615d35b28 Add tests for the new SQLite _TOKENIZE() 'tag' column. 2009-05-19 09:53:38 +01:00
Scott Main
0aa1fbae1e 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
aae9689733 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
ad8195bb0e 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
8ba63601ab 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
402b24c672 Merge commit '842a1f4b0beaacfaab940318fe19909e087aae81' 2009-05-19 01:17:36 -07:00
Android (Google) Code Review
f1f12f8cfc 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
da8e33a57f 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
470c1a8f39 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
fd1879f779 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
51b22d74a3 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
3975fe3f21 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
2f11599eb3 Merge change 1579 into donut
* changes:
  Teleca 2b changes
2009-05-18 22:26:25 -07:00
Wink Saville
e9b06d754a Teleca 2b changes 2009-05-18 21:47:50 -07:00
Android (Google) Code Review
15e74b9da8 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
Brett Chabot
78a1c9067f Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out. 2009-05-18 19:15:09 -07:00
Yang Li
35aa84b1f9 Recovered the code of the gesture library 2009-05-18 18:29:05 -07:00
Android (Google) Code Review
9d16d2072b 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
704a6471a7 Merge change 1927 into donut
* changes:
  Fix build breakage
2009-05-18 16:56:56 -07:00
Daisuke Miyakawa
6e9610e1db Fix build breakage 2009-05-19 08:56:25 +09:00
Android (Google) Code Review
0dfe16dc46 Merge change 1891 into donut
* changes:
  Record statistics about whether HTTP connections are reused.
2009-05-18 16:51:53 -07:00
Scott Main
221c95526d AI 148972: fix link to the installing guide to 1.5;
fix a couple layout bugs in the document.
  BUG=1860640

Automated import of CL 148972
2009-05-18 16:29:41 -07:00
Android (Google) Code Review
842a1f4b0b Merge change 1912 into donut
* changes:
  Hand merge from cupcake_dcm to donut, part 2.
2009-05-18 16:29:27 -07:00
Daisuke Miyakawa
841ddefcb5 Hand merge from cupcake_dcm to donut, part 2.
Modify Contacts-related java files and update vCard importer code to the latest.
2009-05-19 08:26:32 +09:00
Romain Guy
0fef6f5c06 Fix build 2009-05-18 16:18:29 -07:00
Scott Main
84971ae010 Revise the ImageButton class description to include information
about XML <selector> drawables, for managing button state.
2009-05-18 16:05:52 -07:00
Android (Google) Code Review
656a2726ad 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
bb9ea30ea9 Update aapt badging for native code, configs, density, etc. 2009-05-18 15:22:00 -07:00
Android (Google) Code Review
1058c63b26 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
Guang Zhu
2a197b128a Fixed IndexOutofBoundException, improved how memory information is captured (run GC first) 2009-05-18 14:37:23 -07:00
Jeff Sharkey
af99928029 Change BIND_APPWIDGET to be signatureOrSystem.
See http://b/issue?id=1839074 for more details.
2009-05-18 14:35:49 -07:00
Ramanan Rajeswaran
808f2919ee AI 148962: Default language in Switzerland should be german and not english.
Automated import of CL 148962
2009-05-18 14:20:06 -07:00
Android (Google) Code Review
6c25654573 Merge change 1899 into donut
* changes:
  Fix the build
2009-05-18 14:12:22 -07:00