summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* change the DRT to use Light themeGuang Zhu2010-08-241-3/+6
| | | | | | works around the Holo theme crash. Change-Id: I4e920629981bf3df0987bc4f65dc63644b3670b2
* Merge "weird java bug. bug:2941509"Vasu Nori2010-08-231-3/+2
|\
| * weird java bug. bug:2941509Vasu Nori2010-08-231-3/+2
| | | | | | | | Change-Id: I70edabbdb5c715018227958b74fa1ac4e4df3f88
* | Merge "Squashed commit of the following:"Andreas Huber2010-08-2321-98/+296
|\ \
| * | Squashed commit of the following:Andreas Huber2010-08-2321-98/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 35cc68814a9537c31fde146e171e7b0bbdfe211e Author: Andreas Huber <andih@google.com> Date: Mon Aug 16 08:48:42 2010 -0700 Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else. commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 13:56:44 2010 -0700 The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise. commit 684972074b74318bdcb826ed9b5b0864d2d2e273 Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 09:34:35 2010 -0700 A first shot at supporting the new rendering APIs. Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
* | | Merge conflict due to wrong import paths.Gilles Debunne2010-08-231-6/+10
| | | | | | | | | | | | Change-Id: I3bba20b26036de53b29bb0b30885fe33832ba3e3
* | | am caaf7fe3: am 271c1bfd: Merge "Handle the camera open failure better." ↵Wu-cheng Li2010-08-233-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c' * commit 'caaf7fe3a407c764f643585d050c16f5fb56503c': Handle the camera open failure better.
| * \ \ am 271c1bfd: Merge "Handle the camera open failure better." into gingerbreadWu-cheng Li2010-08-193-4/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '271c1bfd60eaa20c3f37e685864d992e0770ac00' into gingerbread-plus-aosp * commit '271c1bfd60eaa20c3f37e685864d992e0770ac00': Handle the camera open failure better.
| | * \ \ Merge "Handle the camera open failure better." into gingerbreadWu-cheng Li2010-08-193-4/+12
| | |\ \ \
| | | * | | Handle the camera open failure better.Wu-cheng Li2010-08-193-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if camera hardware is NULL to avoid mediaserver crash. Change-Id: Ibde0251f30bdb6b36a5d5380222d7be25ec9449c
* | | | | | am 6bacd9c6: am 2f6d975b: Minor MotionEvent optimization.Jeff Brown2010-08-231-29/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6bacd9c6fb799f185be580a0596214b0ce998999' * commit '6bacd9c6fb799f185be580a0596214b0ce998999': Minor MotionEvent optimization.
| * | | | | am 2f6d975b: Minor MotionEvent optimization.Jeff Brown2010-08-191-29/+34
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2f6d975b93bbc5b55c35a00d913ee38ad9b76401' into gingerbread-plus-aosp * commit '2f6d975b93bbc5b55c35a00d913ee38ad9b76401': Minor MotionEvent optimization.
| | * | | | Minor MotionEvent optimization.Jeff Brown2010-08-191-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I862e934e8dae80f394ffd4ab4b4697037805022c
* | | | | | am d457053a: am 07936528: Merge "Cosmetic cleanups to SMSDispatcher ↵Jake Hamby2010-08-233-53/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes." into gingerbread Merge commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88' * commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88': Cosmetic cleanups to SMSDispatcher classes.
| * | | | | am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into ↵Jake Hamby2010-08-193-62/+45
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '07936528cfbacb19d3f70b978708a52c47a31c0e' into gingerbread-plus-aosp * commit '07936528cfbacb19d3f70b978708a52c47a31c0e': Cosmetic cleanups to SMSDispatcher classes.
| | * | | | Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbreadJake Hamby2010-08-193-62/+45
| | |\ \ \ \
| | | * | | | Cosmetic cleanups to SMSDispatcher classes.Jake Hamby2010-08-193-62/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up some typos and other small fixes in SMSDispatcher in preparation for checking in my SMS bug fixes. This change doesn't fix any bugs, but it shouldn't introduce any either. - Removed unused import statements - Removed unused private constants and fields - Fixed typos in Java comments and private constants - Added generic type parameter to mSTrackers ArrayList - Removed unnecessary casts - Fixed indentation of mResultReceiver in SMSDispatcher - Removed call to get unused smsc in CDMA sendSMS() - Changed "|=" to "=" in boolean assignment where the variable was initialized to false (thus the two operators are equivalent) Change-Id: Ic19a63a7ef5cdccc7be86043c2a1b863ec8af652
* | | | | | | am 3a91abcb: am d3aaad0e: Merge "Use getMinFrameCount() instead of querying ↵Chia-chi Yeh2010-08-232-43/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSystem directly." into gingerbread Merge commit '3a91abcb4cd06751009c155bfdce6c0a15a704df' * commit '3a91abcb4cd06751009c155bfdce6c0a15a704df': Use getMinFrameCount() instead of querying AudioSystem directly.
| * | | | | | am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem ↵Chia-chi Yeh2010-08-192-43/+20
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly." into gingerbread Merge commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c' into gingerbread-plus-aosp * commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c': Use getMinFrameCount() instead of querying AudioSystem directly.
| | * | | | | Merge "Use getMinFrameCount() instead of querying AudioSystem directly." ↵Chia-chi Yeh2010-08-192-43/+20
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | Use getMinFrameCount() instead of querying AudioSystem directly.Chia-chi Yeh2010-08-192-43/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c4d2f1778703c1fd1ba5610c46e77c857418bff
* | | | | | | | am 3540760d: am 0ea4ed3b: Don\'t drop a late frame which may lead to missing ↵James Dong2010-08-231-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I frames in the MP4 file Merge commit '3540760d1d68cc883122d44ab1d38f542fb646e6' * commit '3540760d1d68cc883122d44ab1d38f542fb646e6': Don't drop a late frame which may lead to missing I frames in the MP4 file
| * | | | | | | am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in ↵James Dong2010-08-191-1/+15
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the MP4 file Merge commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8' into gingerbread-plus-aosp * commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8': Don't drop a late frame which may lead to missing I frames in the MP4 file
| | * | | | | | Don't drop a late frame which may lead to missing I frames in the MP4 fileJames Dong2010-08-191-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8fef1454264230c1369561670236eb0a19ae4e76
* | | | | | | | am 177a7ad8: am 439fe407: Merge "Return error from MPEG4Writer stop() if the ↵James Dong2010-08-231-0/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check on codec specific data failed" into gingerbread Merge commit '177a7ad825445acaeea38c48c74ad87db935d054' * commit '177a7ad825445acaeea38c48c74ad87db935d054': Return error from MPEG4Writer stop() if the check on codec specific data failed
| * | | | | | | am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on ↵James Dong2010-08-191-0/+26
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codec specific data failed" into gingerbread Merge commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90' into gingerbread-plus-aosp * commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90': Return error from MPEG4Writer stop() if the check on codec specific data failed
| | * | | | | | Merge "Return error from MPEG4Writer stop() if the check on codec specific ↵James Dong2010-08-191-0/+26
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | data failed" into gingerbread
| | | * | | | | | Return error from MPEG4Writer stop() if the check on codec specific data failedJames Dong2010-08-191-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbd08eec9b4201facbad56ff2040f0830cfb0115
* | | | | | | | | Merge "Tethering: Delay 1000ms before processing USB disconnect events"Mike Lockwood2010-08-231-2/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Tethering: Delay 1000ms before processing USB disconnect eventsMike Lockwood2010-08-231-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some devices, switching the USB configuration to enable RNDIS can result in multiple USB disconnect/reconnect events being generated. Change-Id: Id0bfe54293bd51211f84976be2d72f8b1ad0100d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | Merge "resolved conflicts for merge of a842d143 to master"Gilles Debunne2010-08-234-26/+16
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of a842d143 to masterGilles Debunne2010-08-224-26/+16
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I60bba17630d4a4aff5cb8ac9c8b81a2a1fddcd3b
| | * | | | | | | | | am d018a0ce: Merge "Text selection without trackball." into gingerbreadGilles Debunne2010-08-1936-590/+1176
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c' into gingerbread-plus-aosp * commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c': Text selection without trackball.
| | | * | | | | | | | Merge "Text selection without trackball." into gingerbreadGilles Debunne2010-08-1936-590/+1176
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Text selection without trackball.Gilles Debunne2010-08-1936-590/+1176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from HC. Squashed commit of the following: commit af214a595c7a9fdd11a2dc384f7d4665abf751c0 Fixes in TextView's selection. commit eb9fd59ebe6500a66c2003d46b5802299970ae8d TextView with Selection Contextual Mode commit 4c4c338ef355b369ce4b57d6c6fba7ee8f9dddf4 Cosmetic changes around TextView. commit d4b4b054e87480d984ad18766f5e76553e3080d8 Double and one and a half tap removed from TextView. commit 897c2847ba1fca8ef01eadadd1bc3de007af3ee5 Selection handlers in TextView commit 832be74a5394649e28927484d9a86c6d53b430e7 New cursor controller in TextViews. Change-Id: I01cc64736e2abea605317ee53907a1713617fc17
* | | | | | | | | | | | Merge "Renderscript samples. Resolving name conflict in model viewer. Adding ↵Alex Sakhartchouk2010-08-2318-24/+764
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fov projection matrix function. Adding helper methods for blending."
| * | | | | | | | | | | | Renderscript samples.Alex Sakhartchouk2010-08-2318-24/+764
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolving name conflict in model viewer. Adding fov projection matrix function. Adding helper methods for blending. Change-Id: Ibd3f1510436811398787c285845d050158bd6de8
* | | | | | | | | | | | | Merge "Added CHAR_LIMIT in strings."Gilles Debunne2010-08-231-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added CHAR_LIMIT in strings.Gilles Debunne2010-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug http://b/issue?id=2895327 Change-Id: I127ea2a6a33f342f2868de45c67da156db75fc1b
* | | | | | | | | | | | | | More ActionBar/config change tweaks. Preserve open overflow menusAdam Powell2010-08-236-24/+84
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8ad2b1e3909fbf84ff4d852ae046a9f9508477c
* | | | | | | | | | | | | Fix WebView saveState and restoreState for private browsing mode.Elliott Slaughter2010-08-232-12/+6
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia254ee853d73e56c6f0a5b7762a1cefc1dad0894
* | | | | | | | | | | | am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget ↵Scott Main2010-08-2123-6/+86
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes to tutorials" into froyo Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f' * commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f': docs: add links from widget classes to tutorials
| * | | | | | | | | | | am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to ↵Scott Main2010-08-1923-6/+86
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tutorials" into froyo Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp * commit '70c9ffbc838271f0ea27a4780eb146287de53ef6': docs: add links from widget classes to tutorials
| | * | | | | | | | | | am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyoScott Main2010-08-1923-6/+86
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread * commit '11a72482a0cdc45ceaf4ca83957e682381455aee': docs: add links from widget classes to tutorials
| | | * \ \ \ \ \ \ \ \ \ Merge "docs: add links from widget classes to tutorials" into froyoScott Main2010-08-1923-6/+86
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | docs: add links from widget classes to tutorialsScott Main2010-08-1923-6/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I817e885524951853182b0458df4a32dea1614243
* | | | | | | | | | | | | | am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that ↵Gilles Debunne2010-08-211-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displayed the wrong name for missing asset." into gingerbread Merge commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1' * commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1': Fix for a Resource system bug that displayed the wrong name for missing asset.
| * | | | | | | | | | | | | am 189de282: Merge "Fix for a Resource system bug that displayed the wrong ↵Gilles Debunne2010-08-191-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name for missing asset." into gingerbread Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp * commit '189de2820932fd5dc98b9639fdc420a57cfa2316': Fix for a Resource system bug that displayed the wrong name for missing asset.
| | * | | | | | | | | | | | Merge "Fix for a Resource system bug that displayed the wrong name for ↵Gilles Debunne2010-08-191-3/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing asset." into gingerbread
| | | * | | | | | | | | | | | Fix for a Resource system bug that displayed the wrong name for missing asset.Gilles Debunne2010-08-191-3/+1
| | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't reproduce the bug and cannot ensure that this will fix it. The monkey with identical parameters stops with an ANR. Bug http://b/issue?id=2931528 Change-Id: I45f156c6a694f2d67fe514e0f0bb367aa017f08e
generated by cgit v1.1 at 2025-02-04 00:51:10 +0000