Jean-Baptiste Queru
81925e665c
Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
2010-10-20 16:29:15 -07:00
Dianne Hackborn
eddfc04a08
Fix java doc on FLAG_EXTERNAL.
...
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
2010-10-20 16:03:37 -07:00
Wink Saville
1b35f942ec
Merge "Add AsyncChannel and AsyncService."
2010-10-20 15:51:23 -07:00
Wink Saville
d20a5d6b5a
Add AsyncChannel and AsyncService.
...
Change-Id: Ie6f9aed58f49defcd1c051611ce791e2e62a9474
2010-10-20 15:17:28 -07:00
Dianne Hackborn
153bf6c8d7
am e9e23405: Merge "Fix issue #3113424 : Battery stats don\'t reset on Crespo" into gingerbread
...
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp
* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
Fix issue #3113424 : Battery stats don't reset on Crespo
2010-10-20 14:10:29 -07:00
Dianne Hackborn
e9e2340583
Merge "Fix issue #3113424 : Battery stats don't reset on Crespo" into gingerbread
2010-10-20 14:08:26 -07:00
Justin Ho
a747b43993
am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread
...
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp
* commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616':
DO NOT MERGE - Updated media playback transport controls (b/3116268)
2010-10-20 14:04:00 -07:00
Dianne Hackborn
b50187237c
am 74b1ed32: Fix issue #3113219 : NativeActivity using wrong lib path with Java code
...
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp
* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
Fix issue #3113219 : NativeActivity using wrong lib path with Java code
2010-10-20 13:56:03 -07:00
Dirk Dougherty
18cbc0e58a
am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
...
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp
* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
Doc change: escape angle brackets in javadoc comment.
2010-10-20 13:54:09 -07:00
Vasu Nori
c63c320c09
Merge "remove duplicate code"
2010-10-20 13:46:19 -07:00
Vasu Nori
ef7e33b9b8
remove duplicate code
...
Change-Id: I60faf921de4b9add619e2450e0a19a111ede7984
2010-10-20 13:37:33 -07:00
Justin Ho
d5aaff548d
Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread
2010-10-20 13:35:40 -07:00
Amith Yamasani
b1818e83f4
Update dropdown colors and list readability for SearchView.
...
Dismiss IME on launching suggestion.
2010-10-20 13:32:24 -07:00
Justin Ho
6312822111
DO NOT MERGE - Updated media playback transport controls (b/3116268)
...
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
2010-10-20 12:44:46 -07:00
Dianne Hackborn
266e607bde
Fix issue #3113424 : Battery stats don't reset on Crespo
...
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
2010-10-20 12:26:48 -07:00
Irfan Sheriff
4f5f7c9683
Fix wake and scan behavior
...
- Add wakelock for driver start/stop to ensure a wifilock
acquisition kick starts driver. Also cleaned up state machine
driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
reconnections when wifilock exists or when user chooses
never to sleep
- some minor clean up
Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
2010-10-20 12:04:21 -07:00
Ben Murdoch
be00398005
Merge "Set the unique id of the AutoFill profile WebKit can read it"
2010-10-20 11:35:47 -07:00
Shachar Shemesh
2fdf272855
Make the base direction of the Arabic error pages RTL
...
Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef
2010-10-20 11:01:32 -07:00
Shachar Shemesh
56a7739755
Set the base direction of the Hebrew error pages to RTL
...
Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e
2010-10-20 11:01:26 -07:00
Ben Murdoch
b1b82a8df8
Set the unique id of the AutoFill profile WebKit can read it
...
After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.
Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f
2010-10-20 18:56:23 +01:00
Dianne Hackborn
74b1ed3231
Fix issue #3113219 : NativeActivity using wrong lib path with Java code
...
Use the same path whether the .apk has dalvik code or not.
Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
2010-10-20 10:22:45 -07:00
Dirk Dougherty
3466e1fc6d
Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
2010-10-20 09:34:24 -07:00
Ben Murdoch
9532677ad8
Merge "Implement file downloads for Chrome HTTP stack (Java side)"
2010-10-20 08:36:17 -07:00
Iain Merrick
d77f9b7b39
Implement file downloads for Chrome HTTP stack (Java side)
...
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.
See matching C++ change in external/webkit (I81300400)
Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
2010-10-20 15:55:12 +01:00
Leon Scroggins
45afb65561
Merge "Use primary color for matches string."
2010-10-20 06:46:48 -07:00
Wu-cheng Li
b982fb4fd3
Mirror the preview for front-facing cameras. do not merge
...
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.
bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
2010-10-20 18:29:18 +08:00
Jack Wang
b1d042dc31
Merge "Added RepetitiveTest annotation and test runner support"
2010-10-20 03:23:49 -07:00
Adam Powell
548f76f135
Fix bug 3113015 - ProgressDialogs using wrong theme.
...
Change-Id: I161e7feeb2e1a712dff4372417c20913c1dba661
2010-10-19 19:01:55 -07:00
Jack Wang
3fc03e619f
Added RepetitiveTest annotation and test runner support
...
Change-Id: I7bf0871ede6dd69512c6b6ea3484693ba5b78e89
2010-10-19 18:23:18 -07:00
Mindy Pereira
62ad0db623
am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
...
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
2010-10-19 18:23:18 -07:00
Patrick Dubroy
382f7a140e
Merge "Fix memory leak with TouchTargets not being recycled."
2010-10-19 18:03:46 -07:00
Adam Powell
34625c6b41
Merge "Add ActionBar tab callback method onTabReselected"
2010-10-19 17:58:20 -07:00
Mindy Pereira
6fbc5d9c19
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
...
Fixes b/3111778 overscroll glitch in news & weather
Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
2010-10-19 17:38:24 -07:00
Patrick Dubroy
fb0547d2c0
Fix memory leak with TouchTargets not being recycled.
2010-10-19 17:36:18 -07:00
Adam Powell
7f9b90542e
Add ActionBar tab callback method onTabReselected
...
onTabReselected is called if an already-selected tab is chosen again.
For many apps this will be a no-op, but some may treat it as a signal
to return to the top level of a given navigation category.
Change-Id: Ic51fbe477b979562f2d848c4070b2016b217a90f
2010-10-19 17:18:20 -07:00
Dmitri Plotnikov
99291b95b2
Merge "Adding Insert.DATA extra for new/edit contact intents."
2010-10-19 15:49:25 -07:00
Gilles Debunne
02655e5cc8
Fixing naming issue in 74927
...
Change-Id: I9a921674375dcd4f6dce31c6302fa47890e2b65f
2010-10-19 15:42:24 -07:00
Jean-Baptiste Queru
2cead908f4
am db723ea0: Merge "jni: Remove duplicated jniThrowException()"
...
Merge commit 'db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp
* commit 'db723ea0f70392f712542edb1114fc15e782cdb7':
jni: Remove duplicated jniThrowException()
2010-10-19 15:22:13 -07:00
Dianne Hackborn
8f39c64bf1
Fix activated state in holo theme.
...
The background showing the activated state needs to be a
state list so it can change. Also remove the new default
drawable in the selector that appeared, since it is redundant
with the original default of being transparent.
Change-Id: I90b23883af73da05e4b314725ef6a8e374019565
2010-10-19 14:34:09 -07:00
Gilles Debunne
80f54ad9e8
Merge "Renamed drawable-xlarge to drawable-mdpi-xlarge."
2010-10-19 14:27:13 -07:00
Chris Tate
a949d7d881
Merge "Introduce an OnDragListener mechanism"
2010-10-19 13:58:07 -07:00
Chris Tate
32affef4f8
Introduce an OnDragListener mechanism
...
If the listener's onDrag(view, event) returns 'false', the view's own
onDragEvent() will be called. If the listener returns 'true', it
consumes the event (and declares that it will handle the rest of the
drag event sequence, in the case of DRAG_STARTED actions).
Change-Id: I01aff0e4f59f71e55f5eea1049905c80714f0607
2010-10-19 13:56:17 -07:00
Brad Fitzpatrick
6be063d8a9
am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
...
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'
* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
Fix Vibrator permission CTS test broken earlier.
2010-10-19 13:38:00 -07:00
Leon Scroggins
4f4a567217
Tell nativeFindAll whether the new search matches the last one.
...
Bug:3108852
Requires a change in external/webkit.
Change-Id: I4333532b4febfa9e832272cf903c3f96ebff0203
2010-10-19 15:56:56 -04:00
Leon Scroggins
6b38e5cd05
Use primary color for matches string.
...
Bug:3111419
Change-Id: I9cd159ad836c42ca5f3f9aa81db6a82c5362957e
2010-10-19 15:48:54 -04:00
Brad Fitzpatrick
6799864d6c
am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
...
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp
* commit '59993d9bc589089e6be55371c6536a42afe21a64':
Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
2010-10-19 12:44:19 -07:00
Brad Fitzpatrick
59993d9bc5
Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
2010-10-19 12:40:53 -07:00
Joe Onorato
368fdba47a
am bdf1706a: Merge "Reduce logging." into gingerbread
...
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp
* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
Reduce logging.
2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35
am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
...
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp
* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
Fix Vibrator permission CTS test broken earlier.
2010-10-19 12:25:46 -07:00
Amith Yamasani
5931b1f415
Fix layout issues, add a maxWidth attribute to SearchView.
...
Bug: 3067611
Bug: 3067595
2010-10-19 12:24:27 -07:00