Romain Guy
f79ad0c205
Merge "Add support for text underline and strikethru."
2010-08-10 17:27:21 -07:00
Romain Guy
a674ab74e3
Add support for text underline and strikethru.
...
Change-Id: I3a0e6643d7cafbdd06d9a908c8cf9347dcaba146
2010-08-10 17:26:42 -07:00
Adam Powell
42c0fe8652
Fix bug 2908851 - ActionBar does not get initialized if
...
set/addContentView is never called.
Fix bugs around lazy initialization of ActionBar in Activities.
Change-Id: I39a4216a7f6b0051adc4a669b8f921f94148e1db
2010-08-10 17:08:30 -07:00
Adam Powell
368f384377
Merge "Fix bug 2908822 - open/closePanel should do the right thing with ActionBars"
2010-08-10 16:58:44 -07:00
Adam Powell
4c9073a9a4
Merge "Fix bug 2908823"
2010-08-10 16:58:37 -07:00
Adam Cohen
eeca7df892
Merge "Fixing StackView crash associated with DataSetObserver"
2010-08-10 16:55:15 -07:00
Daniel Sandler
139f8f7ec3
Merge "Incremental system bar improvements."
2010-08-10 16:50:57 -07:00
Omprakash Dhyade
92bd90de14
frameworks/base: Swap width and height of temporary buffer only with
...
orientation change
Current code swaps the width and height by assuming that aspect
ratio of the buffer width and height will be same as that of the
layout clip width and height. That is not always true.
Change the check to orientation change.
Change-Id: Ie387f3a7369025427484e4173cbde7a08df2b9d7
2010-08-10 16:49:48 -07:00
Adam Cohen
8322834a25
Fixing StackView crash associated with DataSetObserver
...
Change-Id: Idbc8ed09ee8a58757b7383d6331a4c0357a6fb1f
2010-08-10 16:48:33 -07:00
Jeff Brown
ea48ff4ba4
am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
...
Merge commit '95105f3c25110f28b236cfa71e9ad74533eef854'
* commit '95105f3c25110f28b236cfa71e9ad74533eef854':
Fix safe mode and KeyEvent.getMaxKeyCode().
2010-08-10 16:39:10 -07:00
Jeff Brown
fb8e05b154
am d3cf0544: am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread
...
Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'
* commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
Optimize VelocityTracker to run in linear time.
2010-08-10 16:38:58 -07:00
Jeff Brown
95105f3c25
am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
...
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp
* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
Fix safe mode and KeyEvent.getMaxKeyCode().
2010-08-10 16:33:47 -07:00
Jeff Brown
d3cf0544cc
am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread
...
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp
* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
Optimize VelocityTracker to run in linear time.
2010-08-10 16:31:04 -07:00
Jeff Brown
c3fc2d03d5
Fix safe mode and KeyEvent.getMaxKeyCode().
...
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
2010-08-10 16:28:03 -07:00
Jeff Brown
d98d0fc6e9
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
2010-08-10 16:26:56 -07:00
Adam Powell
f75eeb28de
Fix bug 2908822 - open/closePanel should do the right thing with ActionBars
...
Change-Id: Ic77f9dee864d17046f69c78a1e6d96a49b5c6180
2010-08-10 15:59:40 -07:00
Kenny Root
ffc29498f2
am a27484f0: am 6061af11: Merge "Sort the IME list before showing to user"
...
Merge commit 'a27484f068047453af6345f2c2c58fcc1db899a5'
* commit 'a27484f068047453af6345f2c2c58fcc1db899a5':
Sort the IME list before showing to user
2010-08-10 15:47:27 -07:00
Kenny Root
a27484f068
am 6061af11: Merge "Sort the IME list before showing to user"
...
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp
* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
Sort the IME list before showing to user
2010-08-10 15:38:41 -07:00
Adam Powell
9b4c804b98
Fix bug 2908823
...
Change-Id: Ia20d47ff4e2a09cc0e1ac47cd02a5f152f57073c
2010-08-10 15:36:44 -07:00
Adam Powell
7c312bbd53
Merge "Fix bug 2888333"
2010-08-10 15:35:10 -07:00
Adam Powell
749b0eb2c9
Fix bug 2888333
...
Change-Id: I2e9053e9c68cef447f47d181bfe0ddacc5f7167a
2010-08-10 15:31:02 -07:00
Kenny Root
6061af11cb
Merge "Sort the IME list before showing to user"
2010-08-10 15:22:13 -07:00
Irfan Sheriff
0d25534fed
Split WifiStateMachine from WifiStateTracker
...
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service
Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
2010-08-10 15:18:25 -07:00
Adam Cohen
8a06cf708b
Merge "Preliminary implementation of StackView, which extends AdapterViewAnimator."
2010-08-10 15:10:59 -07:00
Adam Cohen
44729e3d1c
Preliminary implementation of StackView, which extends AdapterViewAnimator.
...
Change-Id: I3e9d1203fc8848835f28d6bc1c9dc0a3fcf7f242
2010-08-10 15:09:31 -07:00
Romain Guy
7a70374606
Merge "Fast text selection drawing."
2010-08-10 14:59:18 -07:00
Romain Guy
a48a1a87ba
Fast text selection drawing.
...
Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
2010-08-10 14:59:15 -07:00
Andreas Huber
a774765686
am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread
...
Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'
* commit 'd35498f6062410e777d6ad41a720db32336e2089':
Remove some obsolete code.
2010-08-10 14:21:32 -07:00
Jeff Hamilton
b721b47811
Add a constructor from CursorAdapter to ResourceCursorAdapter.
...
Change-Id: I423bab1907c24a718a8575d5cbe0cee0e5e4968e
2010-08-10 16:17:09 -05:00
Andreas Huber
d35498f606
am 1a140bf6: Merge "Remove some obsolete code." into gingerbread
...
Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp
* commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
Remove some obsolete code.
2010-08-10 14:15:11 -07:00
Andreas Huber
1a140bf65c
Merge "Remove some obsolete code." into gingerbread
2010-08-10 14:09:39 -07:00
Mathias Agopian
036b07cc28
am 553a333d: am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
...
Merge commit '553a333d4446bb34330da92f02daa515dc597939'
* commit '553a333d4446bb34330da92f02daa515dc597939':
improve a bit the implementation of eglGetProcAddress
2010-08-10 13:55:34 -07:00
Mathias Agopian
553a333d44
am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
...
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp
* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
improve a bit the implementation of eglGetProcAddress
2010-08-10 13:52:58 -07:00
Mathias Agopian
603a34ee30
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
2010-08-10 13:50:22 -07:00
Andreas Huber
6fa131105d
Remove some obsolete code.
...
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
2010-08-10 13:48:53 -07:00
James Dong
c3f20251eb
am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
...
Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609'
* commit 'b9ddd779ae547b020764b89a0cbd96d589717609':
Add input buffer size check for software video encoders
2010-08-10 13:32:40 -07:00
James Dong
b9ddd779ae
am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
...
Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp
* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
Add input buffer size check for software video encoders
2010-08-10 13:28:56 -07:00
James Dong
10ed3f7438
Merge "Add input buffer size check for software video encoders" into gingerbread
2010-08-10 13:27:09 -07:00
Daniel Sandler
dfa08db165
Incremental system bar improvements.
...
- scrolling list of notifications
- fixed crashes when inserting notifications
- new "expand" icon in prep for different touch behavior on
notification icons
- adjustments to the Ticker API in preparation for Kicker
work
Change-Id: I18908cbb2bbbfb7969c7bb48dbda67697732c438
2010-08-10 16:19:33 -04:00
Andreas Huber
3965148396
am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea
...
Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'
* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:04:42 -07:00
Andreas Huber
4dc41bb445
am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
...
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:01:58 -07:00
Andreas Huber
18f0174ff4
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
2010-08-10 12:59:27 -07:00
Romain Guy
623ee2a569
Merge "Fix tons of bugs and add new text rendering support."
2010-08-10 12:23:49 -07:00
Nipun Kwatra
f5e9018b80
Merge "use usleep instead of sleep."
2010-08-10 12:22:13 -07:00
Romain Guy
61c8c9c5b2
Fix tons of bugs and add new text rendering support.
...
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
2010-08-10 12:22:01 -07:00
Eric Fischer
8c9d61c459
Merge "Import revised translations."
2010-08-10 12:18:50 -07:00
Mike Lockwood
e75504d2c7
Merge "MTP: Fix wrong delete operator from previous change."
2010-08-10 12:13:23 -07:00
Mike Lockwood
33ea5a4e86
MTP: Fix wrong delete operator from previous change.
...
Change-Id: I64e8fdc610495f21060727b6bed42d1584833405
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 15:11:32 -04:00
Eric Fischer
28269e91d1
Import revised translations.
...
Change-Id: Idaaed3b13133d531dfd6055809c66df3fba250bb
2010-08-10 12:10:18 -07:00
Nipun Kwatra
7913998c4b
use usleep instead of sleep.
...
Minor bugfix. sleep doesn't take fractional value for seconds, so use
usleep instead of sleep for sleeping small times.
Change-Id: I40e45c30cc595a54c18601117b9a1a3637652f60
2010-08-10 12:08:17 -07:00