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
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
Android (Google) Code Review
cc54b8d978
am 7e4c3432: Merge change 1881 into donut
...
Merge commit '7e4c34329c98fc4279d658387b65ef4d041872a8'
* commit '7e4c34329c98fc4279d658387b65ef4d041872a8':
WifiService: Wifi power management change
2009-05-18 13:44:36 -07:00
Suchi Amalapurapu
d1ebf6d6e8
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.
2009-05-18 13:44:35 -07:00
Mathias Agopian
614ecde4cb
libGLESv1_CM.so doesn't need to depend on libutils or libui
2009-05-18 13:42:18 -07:00
Android (Google) Code Review
e5327fc724
Merge change 1881 into donut
...
* changes:
WifiService: Wifi power management change
2009-05-18 13:17:38 -07:00
Android (Google) Code Review
1c869029f1
am 3a00d763: Merge change 1866 into donut
...
Merge commit '3a00d763dfb22982987e08f4c8751fe68451ed0d'
* commit '3a00d763dfb22982987e08f4c8751fe68451ed0d':
remove unused ContentResolver parameter from IntentResolver.queryIntent.
2009-05-18 10:39:02 -07:00
Android (Google) Code Review
37e2b14b11
Merge change 1866 into donut
...
* changes:
remove unused ContentResolver parameter from IntentResolver.queryIntent.
2009-05-18 10:37:26 -07:00
Android (Google) Code Review
b35ca9bb93
am ce2372de: Merge change 1836 into donut
...
Merge commit 'ce2372de58ad018623748f63e61ffc70c9eb8895'
* commit 'ce2372de58ad018623748f63e61ffc70c9eb8895':
Fix bug 1856713 gl Pointer functions should use Buffer position
2009-05-18 09:31:42 -07:00
Android (Google) Code Review
7754d161d2
Merge change 1836 into donut
...
* changes:
Fix bug 1856713 gl Pointer functions should use Buffer position
2009-05-18 09:30:18 -07:00
Android (Google) Code Review
2173a3a80b
am 6342d393: Merge change 1575 into donut
...
Merge commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4'
* commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4':
Change _TOKENIZE tests to test the new token_index column
2009-05-18 08:36:46 -07:00
Android (Google) Code Review
fa2ab76a4a
Merge change 1575 into donut
...
* changes:
Change _TOKENIZE tests to test the new token_index column
2009-05-17 12:44:38 -07:00
Dianne Hackborn
efe8e5e23b
Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge
2009-05-15 21:15:37 -07:00
Dianne Hackborn
56965f19ab
am 5b3189e0: Fix the build. :(
...
Merge commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f'
* commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f':
Fix the build. :(
Implement compatibility support for WRITE_SDCARD permission.
2009-05-15 18:36:13 -07:00
Jack Palevich
6eedc8d3b5
Fix bug 1856713 gl Pointer functions should use Buffer position
...
JSR239 and android.opengl gl Pointer functions (glColorPointer, etc.)
now respect the current setting of the Buffer position.
This fixes a regression introduced when we started requiring the
Buffers passed to the Pointer functions to be direct Buffers.
2009-05-15 18:13:34 -07:00
Android (Google) Code Review
67b7bbfec5
am ba2a3a1b: Merge change 1831 into donut
...
Merge commit 'ba2a3a1b32e242eea4e97c927d886e8987fde3d4'
* commit 'ba2a3a1b32e242eea4e97c927d886e8987fde3d4':
Tear down data, if a disconnect request is pending.
2009-05-15 17:57:35 -07:00
Android (Google) Code Review
8bf0be4b0f
Merge change 1831 into donut
...
* changes:
Tear down data, if a disconnect request is pending.
2009-05-15 17:41:30 -07:00
Yang Li
89f99205b8
am 935fd37d: Revert "Squashed commit of the following:"
...
Merge commit '935fd37d27804539b141fa074c060d2c15524424'
* commit '935fd37d27804539b141fa074c060d2c15524424':
Revert "Squashed commit of the following:"
2009-05-15 17:24:34 -07:00
Android (Google) Code Review
6ed9676386
Merge change 1777
...
* changes:
If battery status is unknown don't send BATTERY_LOW intent
2009-05-15 16:31:24 -07:00
Android (Google) Code Review
4aa4c81d13
am b3c6addf: Merge change 1825 into donut
...
Merge commit 'b3c6addfc17be2a52133026148f3928ab97c83cb'
* commit 'b3c6addfc17be2a52133026148f3928ab97c83cb':
Fixes #1855461 , #1857290 and #1857365 . Certain scrollbar styles make an opaque view not be opaque. ListView and View now account for this when indicating whether they are opaque or not.
2009-05-15 16:25:42 -07:00
Android (Google) Code Review
526525872c
am b3af6b48: Merge change 1748 into donut
...
Merge commit 'b3af6b4805040ea42c01765387c99089822bbe7e'
* commit 'b3af6b4805040ea42c01765387c99089822bbe7e':
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
2009-05-15 16:25:42 -07:00
Android (Google) Code Review
5e3877f43f
am e85bb9eb: Merge change 1823 into donut
...
Merge commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727'
* commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727':
Add the backup data file writer C++ class.
2009-05-15 16:25:41 -07:00
Android (Google) Code Review
d82ec6fbe1
Merge change 1825 into donut
...
* changes:
Fixes #1855461 , #1857290 and #1857365 . Certain scrollbar styles make an opaque view not be opaque. ListView and View now account for this when indicating whether they are opaque or not.
2009-05-15 16:15:31 -07:00
Android (Google) Code Review
cc38f9745e
Merge change 1748 into donut
...
* changes:
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
2009-05-15 15:55:41 -07:00
Android (Google) Code Review
434c0b0662
Merge change 1823 into donut
...
* changes:
Add the backup data file writer C++ class.
2009-05-15 15:36:32 -07:00
Joe Onorato
d502f05c6b
Add the backup data file writer C++ class.
2009-05-15 18:20:19 -04:00
Yang Li
814fa2d913
am f8173411: Squashed commit of the following:
...
Merge commit 'f8173411cc612017ecfa115d71fb823b0714d982'
* commit 'f8173411cc612017ecfa115d71fb823b0714d982':
Squashed commit of the following:
2009-05-15 15:00:43 -07:00
Dan Egnor
7acdd46440
am abc25e36: Add intent for gservices override, and handle empty arguments properly in the "am" utility.
...
Merge commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71'
* commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71':
Add intent for gservices override, and handle empty arguments properly
2009-05-15 13:31:55 -07:00
Mike LeBeau
50ac70fa03
am a38b427a: Add a search url text color attribute and theme. For search suggestions in global search (and in related apps using system search like the browser), we\'d like to have a consistent green color used for urls. This makes it available system-wide.
...
Merge commit 'a38b427a7a6d2658dc3e3083bc6c263a3d4d7af3'
* commit 'a38b427a7a6d2658dc3e3083bc6c263a3d4d7af3':
Add a search url text color attribute and theme. For search suggestions
2009-05-15 11:51:26 -07:00
Android (Google) Code Review
dbb02bc274
Merge change 1787
...
* changes:
resolved conflicts w/ 5bd644caf73e76750feef1a82b8817d32f5367fc merge....
2009-05-15 11:39:36 -07:00
Eric Fischer
c125aad08d
resolved conflicts w/ 5bd644caf73e76750feef1a82b8817d32f5367fc merge....
2009-05-15 11:38:38 -07:00
Android (Google) Code Review
0ea7ade630
Merge change 1664
...
* changes:
Added PluginManager to handle getting all the plugin directories from PackageManager.
2009-05-15 10:25:52 -07:00