Commit Graph

32400 Commits

Author SHA1 Message Date
Conley Owens
9392afe94a Ignore slide ui change because it is obselete in newly-refactored code 2011-04-29 17:04:25 -07:00
Conley Owens
9428ff9f9c am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit 'af99655e51ac549b7ef664141d676299ef48f3c0':
  Adding missing breaks in BnSurfaceComposer::onTransact
2011-04-29 16:58:26 -07:00
Conley Owens
91461ae1a2 Ignore fix since it is obsolete in newly refactored code 2011-04-29 16:55:43 -07:00
Conley Owens
a6aa9d9e66 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed
2011-04-29 16:44:20 -07:00
Conley Owens
d3241ca3fa am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit 'e321d06430304fa93282c765aa6070c908121a16':
  Adding a sanity test in the while loop in readHistory()
2011-04-29 16:44:14 -07:00
Conley Owens
b91ac99cbd am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit '7bcb2f39154e7d4271486674c5a6db5756de6c29':
  Improved conversion accuracy of exif geotag data
2011-04-29 16:44:08 -07:00
Conley Owens
811a5fa747 Ignore broken image fix since identical change exists in internal tree 2011-04-29 16:40:38 -07:00
Wink Saville
aeb8096e60 am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE
* commit '6e748780ef01174235975508090f2e0af6c16d4d':
  CDMALTE: Evaluate data network type in pollStateDone()
2011-04-29 16:17:58 -07:00
Wink Saville
75bb55b0bb Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 2011-04-29 16:12:59 -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
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
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
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