Gilles Debunne
a1cd52fbd6
am 2bfc75a6: Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"
...
* commit '2bfc75a6d9217d20e6fb17b484424935aa55a575':
Bug 5255124: Move cursor to the end of a word after correction popup alternates selection
2011-09-09 16:03:11 -07:00
Gilles Debunne
2bfc75a6d9
Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"
2011-09-09 16:01:08 -07:00
Gilles Debunne
12b19f97a3
am 4f2b0dc5: Merge "Bug 5278456: text highlight color depends on the type of suggestion spans."
...
* commit '4f2b0dc552dbce06ae6825d099e959b40e6bf0e6':
Bug 5278456: text highlight color depends on the type of suggestion spans.
2011-09-09 15:54:34 -07:00
James Dong
a1e9137c7e
am 4cf9a3b8: Merge "Fix another hardcoded frame rate in the media framework test"
...
* commit '4cf9a3b857e78d7a9a71b104d8531aa18a150978':
Fix another hardcoded frame rate in the media framework test
2011-09-09 15:52:31 -07:00
Gilles Debunne
4f2b0dc552
Merge "Bug 5278456: text highlight color depends on the type of suggestion spans."
2011-09-09 15:52:09 -07:00
James Dong
4cf9a3b857
Merge "Fix another hardcoded frame rate in the media framework test"
2011-09-09 15:50:39 -07:00
Adam Powell
88f8b84e4c
Fix bug 5214224 - Align stock framework list item padding for dialogs
...
Set holo dialog themes to 16dip of padding for list items to align with
theme dialog metrics.
Change-Id: Ia07c08f05fadfe8bbcb596d6fe8a27cc14805c6c
2011-09-09 15:49:03 -07:00
Jaikumar Ganesh
61eb5ae855
Don't override the hash code for the channel.
...
Each channel is uniquely represented by the object itself,
so use the hash code to identify it. Using channelPath in the
calculation will mess up things - since in Connecting state the
channel path is null and when its connected, we will get a different
hash code.
Change-Id: I6af6c783e18fddbd38344432b8156e000baafb15
2011-09-09 15:48:22 -07:00
Guang Zhu
203b5d29be
am 973f553b: Make MediaScanner skip certain directories
...
* commit '973f553be4aabf9656d6c1596b47767896677b0a':
Make MediaScanner skip certain directories
2011-09-09 15:41:18 -07:00
Guang Zhu
973f553be4
Make MediaScanner skip certain directories
...
The list of directories to skip are configurable via setprop.
The main motivation is that some test data folder takes long time
to scan, and media scanner may compete for CPU time against perf
tests therefore skewing the results.
Bug: 5263115
Change-Id: I568213e2a4babf6033021c1d336ef0347c0e3315
2011-09-09 15:36:42 -07:00
Romain Guy
1ef3fdbe04
Go faster!!!!
...
The less we do, the faster we draw.
Change-Id: I7bbc3908b36d8ae295ea3e61ef71fd9ee2187970
2011-09-09 15:34:49 -07:00
Dianne Hackborn
318c6cf6e8
am 7b8d7cb5: Merge "Pull animation attributes out of main view class."
...
* commit '7b8d7cb59cfdc492df920b0c48960a691994f598':
Pull animation attributes out of main view class.
2011-09-09 15:29:27 -07:00
Dianne Hackborn
7b8d7cb59c
Merge "Pull animation attributes out of main view class."
2011-09-09 15:27:44 -07:00
Jaikumar Ganesh
a5465057f6
am 6d172e60: Merge "Add error codes for channel disconnection / connection."
...
* commit '6d172e60bb5c7dcaf1558e875bfbfe8cfe24b073':
Add error codes for channel disconnection / connection.
2011-09-09 15:21:53 -07:00
Jaikumar Ganesh
6d172e60bb
Merge "Add error codes for channel disconnection / connection."
2011-09-09 15:19:43 -07:00
Adam Powell
201ce14494
am 4eb37f8a: Merge "Bug 5214224 - List item metrics"
...
* commit '4eb37f8a2cd9c2ed96d7f0742e180e5aca619ccb':
Bug 5214224 - List item metrics
2011-09-09 15:19:31 -07:00
Adam Powell
4eb37f8a2c
Merge "Bug 5214224 - List item metrics"
2011-09-09 15:18:01 -07:00
Irfan Sheriff
467869220c
am 858c396e: Merge "Finalize wifi watchdog default settings"
...
* commit '858c396e877d04843af6db663218b3992c8fee64':
Finalize wifi watchdog default settings
2011-09-09 15:16:25 -07:00
Irfan Sheriff
858c396e87
Merge "Finalize wifi watchdog default settings"
2011-09-09 15:15:13 -07:00
Irfan Sheriff
885ade6b17
am dd4c7714: Merge "Disable p2p when airplane mode is turned on"
...
* commit 'dd4c7714bb0d73532320c276632f61cf5a0974bf':
Disable p2p when airplane mode is turned on
2011-09-09 15:14:29 -07:00
Irfan Sheriff
dd4c7714bb
Merge "Disable p2p when airplane mode is turned on"
2011-09-09 15:11:44 -07:00
Jim Miller
62744692ab
am 1fe61d73: Merge "Allow lockscreen orientation to be overridden with a system property."
...
* commit '1fe61d73862926c4ec8d5acbfc3e1082e2e47f59':
Allow lockscreen orientation to be overridden with a system property.
2011-09-09 15:04:27 -07:00
Gilles Debunne
1a87ba4636
Bug 5255124: Move cursor to the end of a word after correction popup alternates selection
...
Change-Id: Idd3edc72edf864f256df173bcf643163192ecbde
2011-09-09 15:02:10 -07:00
Jim Miller
1fe61d7386
Merge "Allow lockscreen orientation to be overridden with a system property."
2011-09-09 15:01:49 -07:00
James Dong
4ec5f80910
am 6f84da50: Merge "Don\'t check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
...
* commit '6f84da50ad9a9fa044543fa5dde197f609b01a8f':
Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation
2011-09-09 14:59:09 -07:00
James Dong
6f84da50ad
Merge "Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
2011-09-09 14:56:30 -07:00
Dianne Hackborn
2ac2a7c61c
am e123612c: Merge "Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens"
...
* commit 'e123612c08719352d3313005d0b792f17bbe090d':
Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens
2011-09-09 14:55:13 -07:00
Jim Miller
56bacd76b2
Allow lockscreen orientation to be overridden with a system property.
...
There are cases where lockscreen changes orientation (when docked, etc.),
but it's not easy to test. This allows lockscreen's behavior to be
overridden by command-line.
Change-Id: I7ce1e2ca0ea03a9034a6f537e33650e99e3594d8
2011-09-09 14:54:13 -07:00
Dianne Hackborn
e123612c08
Merge "Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens"
2011-09-09 14:53:53 -07:00
John Huang
e16c279d4f
Handle HSPAP.
...
We were missing a case statement for HSPAP when picking icons.
Treat it the same as the other HSPA types.
bug: 5286238
Change-Id: Ia222cc600a5920e057698ba8b0d2cc8e4836b500
2011-09-09 14:52:57 -07:00
android-merger
42a450149e
bring nfc-extras up to date (same as gingerbread)
...
Change-Id: Ia9cfce0a9919d1903b05fc7eda170a3aa97655ee
2011-09-09 14:49:13 -07:00
Dianne Hackborn
e5ba16a7af
Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens
...
When force stopping an app, when removing its activities also finish any
activities from other apps above it in the task. This avoids some situations
where the task gets into a bad state where its root becomes a different app.
Change-Id: I79e5cd520ae321bec80adefd2ccc2b0370ace372
2011-09-09 14:48:13 -07:00
Ben Komalo
13c7197da8
Revert encryption mapping for device wipes.
...
External storage volumes that were emulated+encrypted needed to have
their encryption mapping removed so that it doesn't try to encrypt the
volume after formatting them.
This just wires through an argument through vold, and assumes that vold
will do the right thing even if there is no encryption mapping set.
Bug: 5017638
Change-Id: I858fae3d12cb415bc34637f520f71220ad9daaad
2011-09-09 14:44:40 -07:00
Dianne Hackborn
ddb715b238
Pull animation attributes out of main view class.
...
These are now in a separate class that is only allocated when
needed by the view.
Change-Id: I9601bb43b3b4bfdabd982b02f7cd7534437b8ac3
2011-09-09 14:43:39 -07:00
Adam Powell
7c8375d652
Bug 5214224 - List item metrics
...
Base list item padding on the theme. Adjust stock framework list items
to obey this. Adjust text sizes in stock list items based on existing
theme attributes.
Change-Id: I98a441e5494fa1d1d34a5f05e525e54e8b0d78b9
2011-09-09 14:41:37 -07:00
Ben Murdoch
2376f8253f
Relax form autocomplete conditions
...
Use the URL host and path rather than the complete url to store
form autocomplete data. This helps in the situation that a site
uses some dynamic query string on the page that contains the form.
Also set the autoocmplete threshold to 1 so that we don't flick the
autocomplete options up and down as you type the first few characters.
Bug: 5265606
Change-Id: I7b372400062ae34f70a78b786007910dc179b101
2011-09-09 22:38:39 +01:00
Dianne Hackborn
e4347ba6b1
am 104f6a07: Merge "Fix issue #5273986 : The power usage of the mp3 background playback..."
...
* commit '104f6a07c9b0613c8a8332eba91e3f93dcb6f083':
Fix issue #5273986 : The power usage of the mp3 background playback...
2011-09-09 14:29:54 -07:00
Dianne Hackborn
104f6a07c9
Merge "Fix issue #5273986 : The power usage of the mp3 background playback..."
2011-09-09 14:28:05 -07:00
Irfan Sheriff
295da73f05
Disable p2p when airplane mode is turned on
...
Bug: 5286610
Change-Id: Ia895dfbf0d1bc39458f4a4d24595c862750eea38
2011-09-09 14:10:15 -07:00
Peter Ng
4e165fca61
am d67ff5c4: Merge "list_dividers for xh are now 2pixels high."
...
* commit 'd67ff5c41d9267dab101f46476474813eb94bfa4':
list_dividers for xh are now 2pixels high.
2011-09-09 13:41:09 -07:00
Peter Ng
d67ff5c41d
Merge "list_dividers for xh are now 2pixels high."
2011-09-09 13:38:40 -07:00
James Dong
4a0c91fc50
Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation
...
Change-Id: Iee9b18449bce9d7565ab5cc7f9e999484051196c
related-to-bug: 5233843
2011-09-09 13:27:27 -07:00
Dianne Hackborn
9fe6cb5cc2
Fix issue #5273986 : The power usage of the mp3 background playback...
...
...increased from ~50mA to 260mA
Change-Id: I24d7188185f4ec5ff9e1f29c15472ae56c851e5e
2011-09-09 13:02:43 -07:00
Irfan Sheriff
998196d64d
Finalize wifi watchdog default settings
...
- Reduce DNS counts from 15 to 5. 15 was for debug.
- Keep success scenario as atleast 1 being successful
- Wait for a second to start checks (for some setups)
- Use one bar as a start for doing periodic DNS checks
- Do a DNS check every hour (instead of half hour)
Bug: 5284337
Change-Id: Ie64d8cac48318a0c4c59f91ad21f8c6712b71338
2011-09-09 12:36:28 -07:00
Peter Ng
88ff3dea17
am 920d06db: Merge "Updated CAB done assets"
...
* commit '920d06db8dd2d6380a437fd03cb54b8caac92cee':
Updated CAB done assets
2011-09-09 11:30:52 -07:00
Peter Ng
920d06db8d
Merge "Updated CAB done assets"
2011-09-09 11:27:40 -07:00
Svetoslav Ganov
b30ed1fc87
am 99e10991: Merge "The time and data pickers did not support IME editor action correctly."
...
* commit '99e109915e2fe08179f6a64c607ef56a91fb1dfa':
The time and data pickers did not support IME editor action correctly.
2011-09-09 11:26:59 -07:00
Svetoslav Ganov
99e109915e
Merge "The time and data pickers did not support IME editor action correctly."
2011-09-09 11:24:24 -07:00
Peter Ng
4618a53e38
list_dividers for xh are now 2pixels high.
...
-1px everywhere but xhdpi
-deleted no dpi
-changed holo_light #000 15%
-changed holo_dark #fff 10%
Change-Id: I1ee16bb21b80655d62b91a2b43b3740700463cc7
2011-09-09 11:23:50 -07:00
Svetoslav Ganov
c11da87053
am 5b60d38a: Merge "Update the sharing UI according to latest UX specs."
...
* commit '5b60d38a8a9f506e32987911d34e94f9e167f099':
Update the sharing UI according to latest UX specs.
2011-09-09 11:20:36 -07:00