Conley Owens
5133e136c9
am 9fd8e057: Merge "Fix memory leak of SkMovie class"
...
* commit '9fd8e0579fb3306f61ba1716b1977562ae3626e1':
Fix memory leak of SkMovie class
2011-04-29 10:24:08 -07:00
Conley Owens
78240a910d
am 8ebf3558: Merge "Implement support for ALT and SHIFT modifiers"
...
* commit '8ebf35589dd2bee84ad93613df21666b8858a10f':
Implement support for ALT and SHIFT modifiers
2011-04-29 10:24:03 -07:00
Conley Owens
078c9c8851
am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal
...
* commit 'b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 10:23:58 -07:00
Conley Owens
3b6b23e1ca
am 1ecd0a9b: Merge "modify the device to enable to get the state as slide-open/slide-close."
...
* commit '1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e':
modify the device to enable to get the state as slide-open/slide-close.
2011-04-29 10:23:53 -07:00
Conley Owens
b87efff93d
am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
...
* commit '69ef0d55d7d7cb9b9bcccffff50ea10ac3833aaa':
Adding missing breaks in BnSurfaceComposer::onTransact
2011-04-29 10:23:47 -07:00
Conley Owens
7ccbe8f0c8
am 7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent value changed"
...
* commit '7ae9f08a179fa3b312b80826cfc3c6dc97b792ec':
Fixed to call computeVisibleRegions() when transparent value changed
2011-04-29 10:23:42 -07:00
Conley Owens
aee2ca4712
am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"
...
* commit '03daee6380772b0ab167a7b28e37d7a21ec89c86':
frameworks/base: acquire lock on am only when needed
2011-04-29 10:23:35 -07:00
Conley Owens
ef50b7279b
am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
...
* commit '2f463ef18bb235be57b39cbda536bcd2df2d0908':
Adding a sanity test in the while loop in readHistory()
2011-04-29 10:23:28 -07:00
Conley Owens
cbd9ca853c
am c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
...
* commit 'c5505f6a150db8232cc275bedd400f7f5a593530':
Improved conversion accuracy of exif geotag data
2011-04-29 10:20:34 -07:00
Conley Owens
ddfe01372c
am e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
...
* commit 'e1b3f15cadc630469cfadea63275ba8d9a1c9052':
Fixes broken image link in "Tools -> Traceview" documentation page.
2011-04-29 10:20:25 -07:00
Conley Owens
1d78460d93
Merge "Fix memory leak of SkMovie class"
2011-04-29 10:00:00 -07:00
Conley Owens
ae9331ec90
Merge "Implement support for ALT and SHIFT modifiers"
2011-04-29 09:59:55 -07:00
Conley Owens
3f9f649a96
Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown"
2011-04-29 09:59:48 -07:00
Conley Owens
5324becece
Merge "modify the device to enable to get the state as slide-open/slide-close."
2011-04-29 09:59:42 -07:00
Conley Owens
615537fc62
Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
2011-04-29 09:59:36 -07:00
Conley Owens
56b79aa816
Merge "Fixed to call computeVisibleRegions() when transparent value changed"
2011-04-29 09:59:30 -07:00
Conley Owens
1f824b15fe
Merge "frameworks/base: acquire lock on am only when needed"
2011-04-29 09:59:22 -07:00
Conley Owens
239c5e0e99
Merge "Adding a sanity test in the while loop in readHistory()"
2011-04-29 09:56:58 -07:00
Conley Owens
816fdf4bb3
Merge "Improved conversion accuracy of exif geotag data"
2011-04-29 09:48:10 -07:00
Conley Owens
c41ff27578
Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
2011-04-29 09:48:04 -07:00
Conley Owens
d8203b0520
am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
...
* commit 'e17870092941cecf64956819d395ec34111cbe71':
Added null check on return value for getKeyDispatcherState()
2011-04-28 23:52:45 -07:00
Conley Owens
4c244c1913
am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
...
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-28 23:52:41 -07:00
Conley Owens
1949d64291
am 11d7ec24: Merge "Removing unnecessary computation."
...
* commit '11d7ec24a55319b68bcc96443372c263a41b7dc5':
Removing unnecessary computation.
2011-04-28 23:52:37 -07:00
Conley Owens
383903d49d
am e41d2aed: Merge "Using robust equality check."
...
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
2011-04-28 23:52:32 -07:00
Conley Owens
79d2f40575
am 1e29552b: Merge "We don\'t need these local references."
...
* commit '1e29552bd5feeb24952a0486e3263396978212df':
We don't need these local references.
2011-04-28 23:52:26 -07:00
Conley Owens
9b0bd8109f
am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
...
* commit 'da882181245fdf3eca827680d656cd298c9c318f':
Eliminating dead code with no other effect than consuming battery life.
2011-04-28 23:52:21 -07:00
Conley Owens
ea98367cd4
Merge "Added null check on return value for getKeyDispatcherState()"
2011-04-28 15:07:00 -07:00
Conley Owens
05945dfc30
Merge "Eliminating dead logic - bitmap state simply cannot be null here."
2011-04-28 14:57:14 -07:00
Conley Owens
a0d4f794fd
Merge "Removing unnecessary computation."
2011-04-28 14:57:11 -07:00
Conley Owens
92add643a1
Merge "Using robust equality check."
2011-04-28 14:57:08 -07:00
Conley Owens
9b6bfdf632
Merge "We don't need these local references."
2011-04-28 14:56:59 -07:00
Conley Owens
a19466e5d0
Merge "Eliminating dead code with no other effect than consuming battery life."
2011-04-28 14:56:55 -07:00
Conley Owens
044fb5186f
am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit 'e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
2011-04-28 12:00:53 -07:00
Conley Owens
65c7f2b723
am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
2011-04-28 11:57:48 -07:00
Conley Owens
ae45dfa68a
Merge "Remove duplicate '=' in exception message"
2011-04-28 11:46:39 -07:00
Eric Fischer
8885bf573b
am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
Import revised translations. DO NOT MERGE
2011-04-27 15:30:36 -07:00
Conley Owens
e0072d13c0
am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard
2011-04-27 14:53:26 -07:00
Conley Owens
40480f7847
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 14:53:15 -07:00
Conley Owens
81cb77ebcf
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 14:53:10 -07:00
Conley Owens
537ce60c3c
am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
2011-04-27 13:53:46 -07:00
Conley Owens
0581488aa6
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 13:53:37 -07:00
Conley Owens
697922855c
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:48:45 -07:00
Conley Owens
aff77c78f7
Merge "Auto hide virtual keyboard"
2011-04-27 13:20:16 -07:00
Conley Owens
1a43e04fd7
Merge "onDetachedFromWindow is called before onAttachedToWindow"
2011-04-27 13:14:57 -07:00
Conley Owens
61b1dd24a9
Merge changes I0ab47e2f,Ib8016996
...
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
f0015cab94
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
2011-04-27 12:46:09 -07:00
Conley Owens
a97b487178
am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
2011-04-27 12:43:19 -07:00
Conley Owens
4dc780e366
Merge "Add lock before calling initEglImage"
2011-04-27 12:28:05 -07:00
Conley Owens
100a051134
am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
2011-04-27 12:18:03 -07:00
Conley Owens
ff13c6559c
Ignore fix for startup NPE as file is deleted.
...
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00