summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix support for 64-bit integers.Stephen Hines2010-10-118-19/+101
| | | | Change-Id: I4e2146a5fda41f280ee3f6f685a34f3cff28f05e
* am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-111-16/+13
|\ | | | | | | | | | | | | Merge commit '83d97f460412f117998f4d446fd65ca79761a294' * commit '83d97f460412f117998f4d446fd65ca79761a294': Add some error-case logging.
| * am 96619f9f: Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-101-16/+13
| |\ | | | | | | | | | | | | | | | | | | Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp * commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696': Add some error-case logging.
| | * Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-101-16/+13
| | |\
| | | * Add some error-case logging.Robert Greenwalt2010-10-101-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Turning off all debug logging is a good thing, but it leaves us blind when errors come in. bug:3075537 Change-Id: I8a4e7f2ce094574ec45cec268bdbc46449540c9f
* | | | am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition ↵Irfan Sheriff2010-10-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | (don\'t auto-merge)" into gingerbread Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9' * commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9': fix getmacaddress race condition (don't auto-merge)
| * | | am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" ↵Irfan Sheriff2010-10-101-20/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp * commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6': fix getmacaddress race condition (don't auto-merge)
| | * | Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbreadIrfan Sheriff2010-10-101-20/+4
| | |\ \
| | | * | fix getmacaddress race condition (don't auto-merge)Irfan Sheriff2010-10-081-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getMacAddress wont go through if the wifi state is not enabled by the time the connection from the supplicant comes through. we now fetch the mac address right after a driver start. Bug: 3072163 Change-Id: I55943e6d618fd7c3170bc579697bc61d70fc8b86
* | | | | am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% ↵Mindy Pereira2010-10-110-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the total available. Merge commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a' * commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a': DO NOT MERGE Set the cap at alpha to 80% of the total available.
| * | | | am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.Mindy Pereira2010-10-101-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp * commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be': DO NOT MERGE Set the cap at alpha to 80% of the total available.
| | * | | DO NOT MERGE Set the cap at alpha to 80% of the total available.Mindy Pereira2010-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No matter how much the user drags, the alpha like the height should not get greater than a max and that max is 80% of what is available in the image. Change-Id: I57d181d6ea685461a44ed3ee29f83a675bc07fbc
* | | | | resolved conflicts for merge of b3ffd4ad to masterBrad Fitzpatrick2010-10-111-6/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I80b227b678ef168a45494acf879debed5861de39
| * | | | am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"Brad Fitzpatrick2010-10-101-8/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp * commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090': Don't perform DNS lookup in android.net.Proxy.isLocalHost
| | * \ \ \ Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"Brad Fitzpatrick2010-10-101-8/+6
| | |\ \ \ \
| | | * | | | Don't perform DNS lookup in android.net.Proxy.isLocalHostAndreas Sandblad2010-10-041-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes degrade introduced by: Switch to using public APIs instead of private ones. 536ff5a6d700a80dbd75adb737ec4b560fbed2dc Change-Id: I63cbea82d85d55d933bcfc9e7a311d1aa2324955
* | | | | | | am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6' * commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6': Fix startDtmf.
| * | | | | | am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-101-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'df5122147c6e1c988c6a8504e71501cbbece5298' into gingerbread-plus-aosp * commit 'df5122147c6e1c988c6a8504e71501cbbece5298': Fix startDtmf.
| | * | | | | Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-101-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Fix startDtmf.John Wang2010-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call correct startDtmf() function. Bug: 3033030 Change-Id: Ia90311ac5d2e4b070a28533c865c81dc90326557
* | | | | | | resolved conflicts for merge of 2da9338c to masterGilles Debunne2010-10-111-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I190aed34c356d26142dfa355adbdb9c7ff22a4af
| * | | | | | am d14230f1: Merge "Made paste work in ExtractEditText" into gingerbreadGilles Debunne2010-10-101-10/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9' into gingerbread-plus-aosp * commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9': Made paste work in ExtractEditText
| | * | | | | Merge "Made paste work in ExtractEditText" into gingerbreadGilles Debunne2010-10-101-10/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Made paste work in ExtractEditTextGilles Debunne2010-10-081-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3064925 Instead of always passing the menu item to the original TextView, do that only for the 'Select word' option. More ExtractEditText magic, but this ZBB so... Change-Id: Ic4cb0526dbb9711e2f13a916b997f480307dcad1
* | | | | | | am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() ↵Mike Lockwood2010-10-112-22/+29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple times" into gingerbread Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05' * commit '748b413e94c73b760c63a03126df2c4712a1ae05': GPS: Do not call sGpsInterface->init() multiple times
| * | | | | | am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" ↵Mike Lockwood2010-10-092-22/+29
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp * commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5': GPS: Do not call sGpsInterface->init() multiple times
| | * | | | | Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbreadMike Lockwood2010-10-092-22/+29
| | |\ \ \ \ \
| | | * | | | | GPS: Do not call sGpsInterface->init() multiple timesMike Lockwood2010-10-092-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f2b55959bd67864168690c1fe619e55edc18268 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "Double the performance of animations."Chet Haase2010-10-111-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Double the performance of animations.Chet Haase2010-10-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a hard-coded limit to the frame rate of animations; this commit increases that rate by changing the inter-frame delay from 30 ms to 10 ms (although the actual delay will be determined by the maximum refresh rate of the system and the system load). For example, the effective maximum on current devices is 55 fps, or a delay of about 16 ms. Change-Id: Id96a41cef36851e2d9508a98934f4b25595251ea
* | | | | | | | | am 833db408: am dc2e5208: Merge "Do not release the wifi lock if the screen ↵Chung-yih Wang2010-10-111-1/+21
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is off." into gingerbread Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d' * commit '833db40866ebf27be33aa387d08a2cb0b9a4246d': Do not release the wifi lock if the screen is off.
| * | | | | | | | am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into ↵Chung-yih Wang2010-10-081-1/+21
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp * commit 'dc2e5208e2b448a2c481d726818de79ea6a49783': Do not release the wifi lock if the screen is off.
| | * | | | | | | Merge "Do not release the wifi lock if the screen is off." into gingerbreadChung-yih Wang2010-10-081-1/+21
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Do not release the wifi lock if the screen is off.Chung-yih Wang2010-10-091-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to be able to receive calls if the device is able to reassociate with any AP later on. Change-Id: Ib7aafb98386bf250ed9b5ec0a5b519594efa1649
* | | | | | | | | am 4c2c62fe: am bed5af7e: am 456fe3b3: add some pages to the sitemap file in ↵Scott Main2010-10-111-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an attempt to kick-start the build server so i can get a doc build Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3' * commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3': add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
| * | | | | | | | am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt ↵Scott Main2010-10-081-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to kick-start the build server so i can get a doc build Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp * commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6': add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
| | * | | | | | | am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start ↵Scott Main2010-10-081-0/+5
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the build server so i can get a doc build Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread * commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15': add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
| | | * | | | | | add some pages to the sitemap file in an attempt to kick-start the build ↵Scott Main2010-10-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server so i can get a doc build Change-Id: If1a33d5f5ee1f3b39c5592748e3d584e060b7278
* | | | | | | | | resolved conflicts for merge of 42dd7ec9 to masterGilles Debunne2010-10-111-9/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Id388745d7ec22c48b34b744d5a4c07097cf2650b
| * | | | | | | | am a827d7bc: Merge "Other improvements to text cursor movement." into ↵Gilles Debunne2010-10-081-13/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp * commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9': Other improvements to text cursor movement.
| | * | | | | | | Merge "Other improvements to text cursor movement." into gingerbreadGilles Debunne2010-10-081-13/+24
| | |\ \ \ \ \ \ \
| | | * | | | | | | Other improvements to text cursor movement.Gilles Debunne2010-10-081-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paste happened on pressed position instead of current cursor location when triggered by a long touch. Change-Id: I86900f2bbb93390d3efa756aeebb424c4ae7e19b
* | | | | | | | | | am 37c8ad77: (-s ours) am 13a81aad: Merge "DO NOT MERGE Limit the height of ↵Mindy Pereira2010-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the pull glow." into gingerbread Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368' * commit '37c8ad779fb171470af2757b5750c1b5f2d1f368': DO NOT MERGE Limit the height of the pull glow.
| * | | | | | | | | am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into ↵Mindy Pereira2010-10-081-5/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp * commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd': DO NOT MERGE Limit the height of the pull glow.
| | * | | | | | | | Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbreadMindy Pereira2010-10-081-5/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | DO NOT MERGE Limit the height of the pull glow.Mindy Pereira2010-10-081-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event when the user keeps pulling, should NEVER get bigger than the max height (~2list items tall). Fixes b/3074337 Overscroll glow can be stretched indefinitely Change-Id: Ifc30d4c907d432faf9ee10ddc20bcc8f50b21f81
* | | | | | | | | | | am 59d5d966: am 3d265b57: am 50f86c65: docs: a few style adjustments to ↵Scott Main2010-10-111-43/+81
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin doc Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce' * commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce': docs: a few style adjustments to admin doc
| * | | | | | | | | | am 3d265b57: am 50f86c65: docs: a few style adjustments to admin docScott Main2010-10-081-43/+81
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp * commit '3d265b5775a74b1d5eb726238f13cf63e8465594': docs: a few style adjustments to admin doc
| | * | | | | | | | | am 50f86c65: docs: a few style adjustments to admin docScott Main2010-10-081-43/+81
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread * commit '50f86c65206072be0ca924f03b8d460365199bcd': docs: a few style adjustments to admin doc
| | | * | | | | | | docs: a few style adjustments to admin docScott Main2010-10-081-43/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ea2416f1f26835b1111aad65cc519dd8d56e099
generated by cgit v1.1 at 2025-11-26 18:48:57 +0000