OSDN Git Service
Joe Onorato [Wed, 20 May 2009 21:21:14 +0000 (14:21 -0700)]
Android (Google) Code Review [Wed, 20 May 2009 21:11:34 +0000 (14:11 -0700)]
am
2d10ba33: Merge change 2111 into donut
Merge commit '
2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc'
* commit '
2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc':
GPS: Add support for forcing NTP time and XTRA data injection.
Android (Google) Code Review [Wed, 20 May 2009 21:00:24 +0000 (14:00 -0700)]
Merge change 2111 into donut
* changes:
GPS: Add support for forcing NTP time and XTRA data injection.
Dianne Hackborn [Wed, 20 May 2009 20:26:02 +0000 (13:26 -0700)]
am
d62ad4f1: Fix issue #
1859814: Add android.os.Build.MANUFACTURER
Merge commit '
d62ad4f120e92fd597f44caf125ac853ac0ea11c'
* commit '
d62ad4f120e92fd597f44caf125ac853ac0ea11c':
Fix issue #
1859814: Add android.os.Build.MANUFACTURER
Android (Google) Code Review [Wed, 20 May 2009 20:15:11 +0000 (13:15 -0700)]
am
4174e268: Merge change 2094 into donut
Merge commit '
4174e2682f4eb6ea35c84e35810312967ea7e233'
* commit '
4174e2682f4eb6ea35c84e35810312967ea7e233':
Fixes #
1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
Android (Google) Code Review [Wed, 20 May 2009 20:13:42 +0000 (13:13 -0700)]
Merge change 2094 into donut
* changes:
Fixes #
1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
Android (Google) Code Review [Wed, 20 May 2009 20:02:17 +0000 (13:02 -0700)]
am
f209b46c: Merge change 2092 into donut
Merge commit '
f209b46c52dc25fbd2c08b14824de9845cc64b07'
* commit '
f209b46c52dc25fbd2c08b14824de9845cc64b07':
Make sure smsHeader != null before using it.
Android (Google) Code Review [Wed, 20 May 2009 20:00:22 +0000 (13:00 -0700)]
Merge change 2092 into donut
* changes:
Make sure smsHeader != null before using it.
Mathias Agopian [Wed, 20 May 2009 02:08:10 +0000 (19:08 -0700)]
move libbinder's header files under includes/binder
Mathias Agopian [Mon, 18 May 2009 22:08:03 +0000 (15:08 -0700)]
checkpoint: split libutils into libutils + libbinder
Android (Google) Code Review [Wed, 20 May 2009 19:18:29 +0000 (12:18 -0700)]
Merge change 2090
* changes:
Fix bug #
1863517: use the new signature for data message token in SubscribedFeedsIntentService.
Android (Google) Code Review [Wed, 20 May 2009 18:58:08 +0000 (11:58 -0700)]
am
e2914615: Merge change 2099 into donut
Merge commit '
e29146158b6048936671decc060d398a68333fc0'
* commit '
e29146158b6048936671decc060d398a68333fc0':
Hook up the backup data writer, and add a utility to read the backup data files.
Android (Google) Code Review [Wed, 20 May 2009 18:53:08 +0000 (11:53 -0700)]
Merge change 2099 into donut
* changes:
Hook up the backup data writer, and add a utility to read the backup data files.
Jean-Baptiste Queru [Wed, 20 May 2009 18:49:58 +0000 (11:49 -0700)]
Android (Google) Code Review [Wed, 20 May 2009 18:49:54 +0000 (11:49 -0700)]
am
40f5a4ea: Merge change 2089 into donut
Merge commit '
40f5a4ea3bc90e43a442ab336f2342020bba86b3'
* commit '
40f5a4ea3bc90e43a442ab336f2342020bba86b3':
Update searchables list in getSearchablesInGlobalSearch().
Android (Google) Code Review [Wed, 20 May 2009 18:49:34 +0000 (11:49 -0700)]
am
a5ca3425: Merge change 2017 into donut
Merge commit '
a5ca3425f9cbb930dc62559893590432ed29c961'
* commit '
a5ca3425f9cbb930dc62559893590432ed29c961':
Increment BatteryStatsImpl's VERSION.
Jean-Baptiste Queru [Wed, 20 May 2009 18:28:11 +0000 (11:28 -0700)]
reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
Jean-Baptiste Queru [Wed, 20 May 2009 18:28:04 +0000 (11:28 -0700)]
donut snapshot
Joe Onorato [Tue, 19 May 2009 20:41:21 +0000 (13:41 -0700)]
Hook up the backup data writer, and add a utility to read the backup data files.
Android (Google) Code Review [Wed, 20 May 2009 18:15:05 +0000 (11:15 -0700)]
Merge change 2089 into donut
* changes:
Update searchables list in getSearchablesInGlobalSearch().
Android (Google) Code Review [Wed, 20 May 2009 16:06:22 +0000 (09:06 -0700)]
Merge change 2017 into donut
* changes:
Increment BatteryStatsImpl's VERSION. That'll make it stop trying to interpret older records with the new format. Also applied other comments involving name changes to remove un-needed 'Wifi' labels in WifiManager API, etc.
Android (Google) Code Review [Wed, 20 May 2009 15:54:45 +0000 (08:54 -0700)]
am
eb2c314b: Merge change 2042 into donut
Merge commit '
eb2c314b4d31c44af8a27ef51120b33290e65837'
* commit '
eb2c314b4d31c44af8a27ef51120b33290e65837':
Remove deprecated openInputStream factory method
Android (Google) Code Review [Wed, 20 May 2009 15:54:45 +0000 (08:54 -0700)]
am
a59aba8c: Merge changes 2023,2036 into donut
Merge commit '
a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8'
* commit '
a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8':
Update more references to openInputStream in support classes.
Modify AudioFlinger to use updated openInputStream factory method.
Android (Google) Code Review [Wed, 20 May 2009 15:54:44 +0000 (08:54 -0700)]
am
f6382011: Merge change 1998 into donut
Merge commit '
f638201182818f9e4041c6a862a297c6723240c0'
* commit '
f638201182818f9e4041c6a862a297c6723240c0':
Add inputSource to openInputStream
Android (Google) Code Review [Wed, 20 May 2009 15:54:42 +0000 (08:54 -0700)]
am
90bd7338: Merge change 2075 into donut
Merge commit '
90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c'
* commit '
90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c':
Fix bad filtering of error code when set_position_mode() is being called.
Android (Google) Code Review [Wed, 20 May 2009 15:54:40 +0000 (08:54 -0700)]
am
97dd7ac8: Merge change 1860 into donut
Merge commit '
97dd7ac8ede4eec057977dd579f236519782be7c'
* commit '
97dd7ac8ede4eec057977dd579f236519782be7c':
ActivityManagerService sends bug reports on crashes and ANRs
Android (Google) Code Review [Wed, 20 May 2009 15:54:39 +0000 (08:54 -0700)]
am
9fb724ba: Merge change 1804 into donut
Merge commit '
9fb724ba90364b86265dea6b281d182d26124606'
* commit '
9fb724ba90364b86265dea6b281d182d26124606':
Additional logging in buildSearchableList().
Android (Google) Code Review [Wed, 20 May 2009 15:54:39 +0000 (08:54 -0700)]
am
5bc21aa0: Merge change 1127 into donut
Merge commit '
5bc21aa0671d83e406b46e0431816dea8d9ca5cb'
* commit '
5bc21aa0671d83e406b46e0431816dea8d9ca5cb':
SmsHeader rewrite, in preparation for migration to public API.
Dianne Hackborn [Wed, 20 May 2009 15:54:35 +0000 (08:54 -0700)]
Dianne Hackborn [Wed, 20 May 2009 15:54:33 +0000 (08:54 -0700)]
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.
Android (Google) Code Review [Wed, 20 May 2009 14:15:50 +0000 (07:15 -0700)]
Merge change 2042 into donut
* changes:
Remove deprecated openInputStream factory method
Android (Google) Code Review [Wed, 20 May 2009 14:15:39 +0000 (07:15 -0700)]
Merge changes 2023,2036 into donut
* changes:
Update more references to openInputStream in support classes. Continuation of bug
1846343
Modify AudioFlinger to use updated openInputStream factory method. Continuation of bug
1846343
Android (Google) Code Review [Wed, 20 May 2009 14:14:32 +0000 (07:14 -0700)]
Merge change 1998 into donut
* changes:
Add inputSource to openInputStream Continuation of bug
1846343
Android (Google) Code Review [Wed, 20 May 2009 12:50:32 +0000 (05:50 -0700)]
Merge change 2075 into donut
* changes:
Fix bad filtering of error code when set_position_mode() is being called.
Android (Google) Code Review [Wed, 20 May 2009 09:55:28 +0000 (02:55 -0700)]
Merge change 1860 into donut
* changes:
ActivityManagerService sends bug reports on crashes and ANRs
Android (Google) Code Review [Wed, 20 May 2009 09:42:01 +0000 (02:42 -0700)]
Merge change 1804 into donut
* changes:
Additional logging in buildSearchableList().
Android (Google) Code Review [Wed, 20 May 2009 02:52:07 +0000 (19:52 -0700)]
Merge change 1127 into donut
* changes:
SmsHeader rewrite, in preparation for migration to public API.
Dave Sparks [Wed, 20 May 2009 01:56:13 +0000 (18:56 -0700)]
Remove deprecated openInputStream factory method
Dave Sparks [Wed, 20 May 2009 01:28:20 +0000 (18:28 -0700)]
Update more references to openInputStream in support classes.
Continuation of bug
1846343
Jaikumar Ganesh [Wed, 20 May 2009 00:36:59 +0000 (17:36 -0700)]
am
ee748d37: Fix network preference getting incorrectly set.
Merge commit '
ee748d37b01b3affb72b701d95ba20c189887b5f'
* commit '
ee748d37b01b3affb72b701d95ba20c189887b5f':
Fix network preference getting incorrectly set.
Android (Google) Code Review [Wed, 20 May 2009 00:20:07 +0000 (17:20 -0700)]
am
83a6ec60: Merge change 1791 into donut
Merge commit '
83a6ec600259d245b799a99a8e963704db031a63'
* commit '
83a6ec600259d245b799a99a8e963704db031a63':
Add a method to get the PhoneType in CellLocation.
Android (Google) Code Review [Wed, 20 May 2009 00:19:21 +0000 (17:19 -0700)]
Merge change 1791 into donut
* changes:
Add a method to get the PhoneType in CellLocation.
Android (Google) Code Review [Tue, 19 May 2009 23:54:25 +0000 (16:54 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 23:52:41 +0000 (16:52 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 23:52:31 +0000 (16:52 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 23:52:26 +0000 (16:52 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 23:51:29 +0000 (16:51 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 23:51:28 +0000 (16:51 -0700)]
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.
Dave Sparks [Tue, 19 May 2009 23:41:29 +0000 (16:41 -0700)]
Modify AudioFlinger to use updated openInputStream factory method.
Continuation of bug
1846343
Android (Google) Code Review [Tue, 19 May 2009 22:22:35 +0000 (15:22 -0700)]
am
988c4d1a: Merge change 2005 into donut
Merge commit '
988c4d1a3ece97c078658a67b15949db900641e0'
* commit '
988c4d1a3ece97c078658a67b15949db900641e0':
Added the write sdcard permission so that the mediarecorder test
Android (Google) Code Review [Tue, 19 May 2009 22:21:35 +0000 (15:21 -0700)]
Merge change 2005 into donut
* changes:
Added the write sdcard permission so that the mediarecorder test can write the new recorded video into sdcard.
San Mehat [Tue, 19 May 2009 22:01:47 +0000 (15:01 -0700)]
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
Dave Sparks [Tue, 19 May 2009 21:38:46 +0000 (14:38 -0700)]
Add inputSource to openInputStream
Continuation of bug
1846343
Android (Google) Code Review [Tue, 19 May 2009 21:04:04 +0000 (14:04 -0700)]
am
65ff54c4: Merge change 1967 into donut
Merge commit '
65ff54c44bbd8c1dd6818d42b7c91c634c644aa9'
* commit '
65ff54c44bbd8c1dd6818d42b7c91c634c644aa9':
Document the media scanner's flow through native and java code, since
Android (Google) Code Review [Tue, 19 May 2009 19:03:47 +0000 (12:03 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 18:16:24 +0000 (11:16 -0700)]
am
f313b59b: Merge change 1957 into donut
Merge commit '
f313b59b4fd6711c734288badd75c6aa0b57ee6e'
* commit '
f313b59b4fd6711c734288badd75c6aa0b57ee6e':
Settings: Disable network location service by default, enable GPS instead.
Mike Lockwood [Tue, 19 May 2009 18:16:24 +0000 (11:16 -0700)]
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
Android (Google) Code Review [Tue, 19 May 2009 18:15:50 +0000 (11:15 -0700)]
Merge change 1957 into donut
* changes:
Settings: Disable network location service by default, enable GPS instead.
Android (Google) Code Review [Tue, 19 May 2009 17:52:40 +0000 (10:52 -0700)]
Merge change 1902
* changes:
Throttle one last user activity call to 1/sec that was missed last time
Android (Google) Code Review [Tue, 19 May 2009 17:33:57 +0000 (10:33 -0700)]
am
12bb9471: Merge change 1936 into donut
Merge commit '
12bb9471cb9ce2eb48d8e9817841f43e7220566f'
* commit '
12bb9471cb9ce2eb48d8e9817841f43e7220566f':
Recovered the code of the gesture library
Android (Google) Code Review [Tue, 19 May 2009 17:32:01 +0000 (10:32 -0700)]
Merge change 1936 into donut
* changes:
Recovered the code of the gesture library
Mihai Preda [Tue, 19 May 2009 12:19:50 +0000 (05:19 -0700)]
am
c3320dbe: Minor performance improvement when filtering intents by package.
Merge commit '
c3320dbe1c7acf040a3ec895129d8aae09c570ea'
* commit '
c3320dbe1c7acf040a3ec895129d8aae09c570ea':
Minor performance improvement when filtering intents by package.
Bjorn Bringert [Tue, 19 May 2009 09:41:40 +0000 (02:41 -0700)]
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.
Scott Main [Tue, 19 May 2009 08:19:23 +0000 (01:19 -0700)]
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;
Ramanan Rajeswaran [Tue, 19 May 2009 08:19:23 +0000 (01:19 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 08:19:18 +0000 (01:19 -0700)]
Android (Google) Code Review [Tue, 19 May 2009 08:19:15 +0000 (01:19 -0700)]
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.
The Android Open Source Project [Tue, 19 May 2009 08:17:36 +0000 (01:17 -0700)]
Android (Google) Code Review [Tue, 19 May 2009 06:56:07 +0000 (23:56 -0700)]
am
656a2726: Merge change 1910 into donut
Merge commit '
656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'
* commit '
656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
Update aapt badging for native code, configs, density, etc.
Android (Google) Code Review [Tue, 19 May 2009 06:56:07 +0000 (23:56 -0700)]
am
1058c63b: Merge change 1909 into donut
Merge commit '
1058c63b262c838a57301fde59b04c9fa0ee1fdc'
* commit '
1058c63b262c838a57301fde59b04c9fa0ee1fdc':
Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
Jeff Sharkey [Tue, 19 May 2009 06:56:06 +0000 (23:56 -0700)]
am
af999280: Change BIND_APPWIDGET to be signatureOrSystem.
Merge commit '
af9992802992aaccfe1fb5893448939f215dd607'
* commit '
af9992802992aaccfe1fb5893448939f215dd607':
Change BIND_APPWIDGET to be signatureOrSystem.
Android (Google) Code Review [Tue, 19 May 2009 06:56:04 +0000 (23:56 -0700)]
Scott Main [Tue, 19 May 2009 06:25:10 +0000 (23:25 -0700)]
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;
Ramanan Rajeswaran [Tue, 19 May 2009 06:25:04 +0000 (23:25 -0700)]
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.
Android (Google) Code Review [Tue, 19 May 2009 05:26:25 +0000 (22:26 -0700)]
Merge change 1579 into donut
* changes:
Teleca 2b changes
Android (Google) Code Review [Tue, 19 May 2009 02:34:33 +0000 (19:34 -0700)]
Merge change 1939 into donut
* changes:
Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
Android (Google) Code Review [Tue, 19 May 2009 00:03:24 +0000 (17:03 -0700)]
Merge change 1916 into donut
* changes:
Revise the ImageButton class description to include information about XML <selector> drawables, for managing button state.
Android (Google) Code Review [Mon, 18 May 2009 23:56:56 +0000 (16:56 -0700)]
Merge change 1927 into donut
* changes:
Fix build breakage
Android (Google) Code Review [Mon, 18 May 2009 23:51:53 +0000 (16:51 -0700)]
Merge change 1891 into donut
* changes:
Record statistics about whether HTTP connections are reused.
Android (Google) Code Review [Mon, 18 May 2009 23:29:27 +0000 (16:29 -0700)]
Merge change 1912 into donut
* changes:
Hand merge from cupcake_dcm to donut, part 2.
Android (Google) Code Review [Mon, 18 May 2009 22:38:34 +0000 (15:38 -0700)]
Merge change 1910 into donut
* changes:
Update aapt badging for native code, configs, density, etc.
Dianne Hackborn [Mon, 18 May 2009 22:22:00 +0000 (15:22 -0700)]
Update aapt badging for native code, configs, density, etc.
Android (Google) Code Review [Mon, 18 May 2009 22:18:17 +0000 (15:18 -0700)]
Merge change 1909 into donut
* changes:
Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
Android (Google) Code Review [Mon, 18 May 2009 21:12:22 +0000 (14:12 -0700)]
Merge change 1899 into donut
* changes:
Fix the build
Android (Google) Code Review [Mon, 18 May 2009 21:09:00 +0000 (14:09 -0700)]
am
a0068514: Merge change 1894 into donut
Merge commit '
a0068514e7c60252a96fa7907ff976bef46b4c40'
* commit '
a0068514e7c60252a96fa7907ff976bef46b4c40':
libGLESv1_CM.so doesn't need to depend on libutils or libui
Android (Google) Code Review [Mon, 18 May 2009 21:07:21 +0000 (14:07 -0700)]
Merge change 1894 into donut
* changes:
libGLESv1_CM.so doesn't need to depend on libutils or libui
Romain Guy [Mon, 18 May 2009 21:02:14 +0000 (14:02 -0700)]
am
9da06a4e: Fixes external #2686. Fix typo.
Merge commit '
9da06a4e2e16c3cd59720cf7848500683a48ed5a'
* commit '
9da06a4e2e16c3cd59720cf7848500683a48ed5a':
Fixes external #2686. Fix typo.
The Android Open Source Project [Mon, 18 May 2009 21:00:41 +0000 (14:00 -0700)]
Android (Google) Code Review [Mon, 18 May 2009 20:52:06 +0000 (13:52 -0700)]
Merge change 1875 into donut
* changes:
Fixes external #2669. Clarify the documentation of the XML attributes android:gravity and android:layout_gravity.
Android (Google) Code Review [Mon, 18 May 2009 20:44:36 +0000 (13:44 -0700)]
am
7e4c3432: Merge change 1881 into donut
Merge commit '
7e4c34329c98fc4279d658387b65ef4d041872a8'
* commit '
7e4c34329c98fc4279d658387b65ef4d041872a8':
WifiService: Wifi power management change
Suchi Amalapurapu [Mon, 18 May 2009 20:44:35 +0000 (13:44 -0700)]
am
d1a93373: Add a new window flag to display a window when keyguard is shown.
Merge commit '
d1a9337380cf9f40f1aa095457b11242d483295d'
* commit '
d1a9337380cf9f40f1aa095457b11242d483295d':
Add a new window flag to display a window when keyguard is shown.
Mathias Agopian [Mon, 18 May 2009 20:42:18 +0000 (13:42 -0700)]
libGLESv1_CM.so doesn't need to depend on libutils or libui
Android (Google) Code Review [Mon, 18 May 2009 20:17:38 +0000 (13:17 -0700)]
Merge change 1881 into donut
* changes:
WifiService: Wifi power management change
Android (Google) Code Review [Mon, 18 May 2009 17:39:02 +0000 (10:39 -0700)]
am
3a00d763: Merge change 1866 into donut
Merge commit '
3a00d763dfb22982987e08f4c8751fe68451ed0d'
* commit '
3a00d763dfb22982987e08f4c8751fe68451ed0d':
remove unused ContentResolver parameter from IntentResolver.queryIntent.
Android (Google) Code Review [Mon, 18 May 2009 17:37:26 +0000 (10:37 -0700)]
Merge change 1866 into donut
* changes:
remove unused ContentResolver parameter from IntentResolver.queryIntent.
Android (Google) Code Review [Mon, 18 May 2009 16:31:42 +0000 (09:31 -0700)]
am
ce2372de: Merge change 1836 into donut
Merge commit '
ce2372de58ad018623748f63e61ffc70c9eb8895'
* commit '
ce2372de58ad018623748f63e61ffc70c9eb8895':
Fix bug
1856713 gl Pointer functions should use Buffer position
Android (Google) Code Review [Mon, 18 May 2009 16:30:18 +0000 (09:30 -0700)]
Merge change 1836 into donut
* changes:
Fix bug
1856713 gl Pointer functions should use Buffer position
Android (Google) Code Review [Mon, 18 May 2009 15:36:46 +0000 (08:36 -0700)]
am
6342d393: Merge change 1575 into donut
Merge commit '
6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4'
* commit '
6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4':
Change _TOKENIZE tests to test the new token_index column
Android (Google) Code Review [Sun, 17 May 2009 19:44:38 +0000 (12:44 -0700)]
Merge change 1575 into donut
* changes:
Change _TOKENIZE tests to test the new token_index column
Dianne Hackborn [Sat, 16 May 2009 04:15:37 +0000 (21:15 -0700)]
Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge