Conley Owens
b36dad640c
am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
...
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
Added null check on return value for getKeyDispatcherState()
2011-04-29 15:11:48 -07:00
Conley Owens
a767c44489
am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
...
* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-29 15:11:45 -07:00
Conley Owens
22c5e26939
am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."
...
* commit '889bb20f1bb47437331d404a59b86e6dfa4e2e93':
Removing unnecessary computation.
2011-04-29 15:11:41 -07:00
Conley Owens
c0f3e83df1
am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
...
* commit 'bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':
2011-04-29 15:11:38 -07:00
Conley Owens
1ad9b43ac7
am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
...
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
Using robust equality check.
2011-04-29 15:11:34 -07:00
Conley Owens
3a770d11c7
am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references."
...
* commit '014757eea22fc9cceede1548c579c33c79464001':
We don't need these local references.
2011-04-29 15:11:30 -07:00
Conley Owens
dc48b1b103
am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
...
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
Eliminating dead code with no other effect than consuming battery life.
2011-04-29 15:11:26 -07:00
Conley Owens
b19bd46f33
am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit 'ded7c652d754751e6fbde729d66825c69394d1cb':
Remove duplicate '=' in exception message
2011-04-29 15:11:22 -07:00
Nick Kralevich
fd28cfcd3d
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-04-29 15:11:19 -07:00
Svetoslav Ganov
77df00abff
Merge "Touch exploration - nits"
2011-04-29 15:10:14 -07:00
Scott Main
7e5c5809ee
am 27ad0df0: am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
...
* commit '27ad0df013e7eac9b7b9b6b207832f5ca3bf77e3':
docs: tweak table headers for config qualifiers
2011-04-29 15:09:23 -07:00
James Dong
4e0afc2299
am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
...
* commit 'a1f6a09a86f4acd2147d4f1110eedc6643bbf80b':
Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 15:09:14 -07:00
Scott Main
8b6be1a8cf
am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
docs: more documentation for ProgressBar
2011-04-29 15:05:10 -07:00
Scott Main
7d2fef4399
am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Conley Owens
9d09b81e22
am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
...
* commit '54668b8a3599559fc007af1d75c039400a05e898':
Added null check on return value for getKeyDispatcherState()
2011-04-29 14:57:53 -07:00
Conley Owens
460913981a
am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
...
* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-29 14:57:18 -07:00
Conley Owens
b930fb22b2
am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."
...
* commit 'eef8f148881f39feb0b1aded121bbfc63e8d30c2':
Removing unnecessary computation.
2011-04-29 14:57:10 -07:00
Conley Owens
34483e7494
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-04-29 14:56:59 -07:00
Conley Owens
deed89f468
am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
...
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
Using robust equality check.
2011-04-29 14:56:15 -07:00
Scott Main
d044b56913
am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
...
* commit '205d6fb38d3c39a39ee9721b0d8e3649afacad18':
docs: tweak table headers for config qualifiers
2011-04-29 14:56:06 -07:00
Conley Owens
e8b95726a9
am a9517012: am 1e29552b: Merge "We don\'t need these local references."
...
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
We don't need these local references.
2011-04-29 14:56:05 -07:00
Conley Owens
b3ac5eab4f
am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
...
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
Eliminating dead code with no other effect than consuming battery life.
2011-04-29 14:55:55 -07:00
Scott Main
0d1ed0af4a
am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit '1462813a28270d4255f9542b666960182e274a6e':
docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Conley Owens
a7fe45cd87
am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit '893812b2ee4a640ad398f7f79f90b92d52a5f3b1':
Remove duplicate '=' in exception message
2011-04-29 14:55:35 -07:00
James Dong
73e73d573e
am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
...
* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:53:30 -07:00
Scott Main
8e06acecc4
Merge "docs: more documentation for ProgressBar" into honeycomb
2011-04-29 14:52:20 -07:00
Jason Sams
57dbc027ad
Merge "Pipe rsa function though the RS api table."
2011-04-29 14:51:37 -07:00
Jason Sams
7731380705
Merge "Fix fifo size check code."
2011-04-29 14:50:09 -07:00
Scott Main
b858714b8d
am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
...
* commit 'be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
docs: tweak table headers for config qualifiers
2011-04-29 14:46:28 -07:00
James Dong
aad1ad8fd4
am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
...
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:42:58 -07:00
Scott Main
34db3e567e
am c7eb47fa: docs: tweak table headers for config qualifiers
...
* commit 'c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
docs: tweak table headers for config qualifiers
2011-04-29 14:42:55 -07:00
Gilles Debunne
1c52ae3b72
Merge "SuggestionSpans are removed around edited text."
2011-04-29 13:30:03 -07:00
Robert Greenwalt
7b0eaac1d7
am 67c92fbd: am 5f2ff42b: Add data to bugreports.
...
* commit '67c92fbdfe52a94804f021c2255132c0f3550875':
Add data to bugreports.
2011-04-29 10:26:26 -07:00
Conley Owens
2f56d20cb0
am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
...
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
Adjust mBiggerTouchSlopSquare to the suitable value
2011-04-29 10:24:34 -07:00
Conley Owens
05e4042a1e
am 76616b13: Merge "Scolling using arrow keys with padding"
...
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
Scolling using arrow keys with padding
2011-04-29 10:24:29 -07:00
Conley Owens
400c441832
am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
...
* commit '425db473a05e4204301bf46d4ab6f51b12d9c447':
CHAR_SEQUENCE_CREATOR cannot handle null string
2011-04-29 10:24:23 -07:00
Conley Owens
88acc06a54
am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
...
* commit '58e4a5e2094c5003225fc715ee1a53b2461e71b1':
Fixed to draw texture when loadTexture() is called at first time
2011-04-29 10:24:16 -07:00
Conley Owens
a7c8b48525
am 9355a24a: Merge "Fixing wrong Japanese phone formatter."
...
* commit '9355a24af2a4985902f1e9ab4233df3fb831ef72':
Fixing wrong Japanese phone formatter.
2011-04-29 10:24:12 -07:00
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
Robert Greenwalt
65d547c60f
am 5f2ff42b: Add data to bugreports.
...
* commit '5f2ff42b282e093b61b9e7b07c79a74ea8ce3272':
Add data to bugreports.
2011-04-29 10:14:26 -07:00
Conley Owens
88a1e7da4b
Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
2011-04-29 10:01:23 -07:00