summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OpenGL ES 1 YUV texturing testNuno Subtil2010-10-272-0/+352
| | | | Change-Id: I295e5bce16a8ab088b99929f788f2fbbe8492b8d
* YUV texturing test.Michael I. Gold2010-10-272-0/+446
| | | | Change-Id: Ib2a6b7eb2a5fc98ecaace032d6c63d50613aaa0d
* Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952"Romain Guy2010-10-251-4/+10
|\
| * Don't initialize the hw renderer without a valid surface.Romain Guy2010-10-251-4/+10
| | | | | | | | | | | | Bug #3054952 Change-Id: I5b4074391dbd84b04a14f7d2fb1b9a4a2487e1e2
* | am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into ↵Jeff Hamilton2010-10-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e' * commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e': Add a RHS status bar slot for NFC.
| * \ am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbreadJeff Hamilton2010-10-251-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp * commit '106165b5102be226eb8049d2f7f62d7e26034e8a': Add a RHS status bar slot for NFC.
| | * \ Merge "Add a RHS status bar slot for NFC." into gingerbreadJeff Hamilton2010-10-251-0/+1
| | |\ \
| | | * | Add a RHS status bar slot for NFC.Jeff Hamilton2010-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
* | | | | Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly ↵Adam Cohen2010-10-252-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1"
| * | | | | -> Fixing a bug where AdapterViewAnimator doesn't refresh correctlyAdam Cohen2010-10-252-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1
* | | | | | am 6c8d8d89: am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6c8d8d8927373fdb9ad1c853396b5dbc8295f996' * commit '6c8d8d8927373fdb9ad1c853396b5dbc8295f996': GPS: Disable verbose logging
| * | | | | am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp * commit '8c32bddfac259543f4ed87341fce42bc5ed60506': GPS: Disable verbose logging
| | * | | | Merge "GPS: Disable verbose logging" into gingerbreadMike Lockwood2010-10-252-5/+7
| | |\ \ \ \
| | | * | | | GPS: Disable verbose loggingMike Lockwood2010-10-252-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3127049 Change-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am e1ca532d: am 457bed2b: Merge "fix [3123221] Video sticks playing back ↵Mathias Agopian2010-10-252-0/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upside down following orientation switch" into gingerbread Merge commit 'e1ca532d72cbfacdce794f8bb4d439e609ec9871' * commit 'e1ca532d72cbfacdce794f8bb4d439e609ec9871': fix [3123221] Video sticks playing back upside down following orientation switch
| * | | | | | am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down ↵Mathias Agopian2010-10-252-0/+16
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following orientation switch" into gingerbread Merge commit '457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp * commit '457bed2bc6561dd67429dde238453fee8602fa9b': fix [3123221] Video sticks playing back upside down following orientation switch
| | * | | | | Merge "fix [3123221] Video sticks playing back upside down following ↵Mathias Agopian2010-10-252-0/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | orientation switch" into gingerbread
| | | * | | | | fix [3123221] Video sticks playing back upside down following orientation switchMathias Agopian2010-10-242-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the overlay wasn't reconfigured when the screen-orientation changed. It was only done when a parameter of the surface itself changed. Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
* | | | | | | | am b4645353: am ce4d36ad: Merge "fix [3118445] Transform * Transform does ↵Mathias Agopian2010-10-254-46/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work as expected" into gingerbread Merge commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368' * commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368': fix [3118445] Transform * Transform does not work as expected
| * | | | | | | am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as ↵Mathias Agopian2010-10-254-46/+87
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected" into gingerbread Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp * commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e': fix [3118445] Transform * Transform does not work as expected
| | * | | | | | Merge "fix [3118445] Transform * Transform does not work as expected" into ↵Mathias Agopian2010-10-254-46/+87
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | gingerbread
| | | * | | | | fix [3118445] Transform * Transform does not work as expectedMathias Agopian2010-10-244-46/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem wasn't in the multiply operator, but rather in the code that built the transform from the HAL bitmask. We now use the multiply operator to build the Transform from the bitmask, which guarantees, it'll always be correct. Also added a simple test for Transform. Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
* | | | | | | | Merge "Swipe up to open the settings panel. Tap anywhere to close."Daniel Sandler2010-10-251-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Swipe up to open the settings panel. Tap anywhere to close.Daniel Sandler2010-10-251-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help reduce false hits on the clock when typing on an on-screen keyboard. Change-Id: I3afab88c800873d1801b16ac79ffa3e7ddd42949
* | | | | | | | | Merge "We don't have access to the md5 implementation on the simulator, ↵Andreas Huber2010-10-251-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let's disable digest authentication in rtsp for simulator targets."
| * | | | | | | | | We don't have access to the md5 implementation on the simulator, let's ↵Andreas Huber2010-10-251-0/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable digest authentication in rtsp for simulator targets. Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
* | | | | | | | | am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - ↵Adam Powell2010-10-250-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout in CTS test ExpandableListViewBasicTest" into gingerbread Merge commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e' * commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e': DO NOT MERGE Fix bug 3124899 - timeout in CTS test
| * | | | | | | | am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ↵Adam Powell2010-10-251-1/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpandableListViewBasicTest" into gingerbread Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp * commit '17efcde161cbcbc0d98bf809036c5e640497f001': DO NOT MERGE Fix bug 3124899 - timeout in CTS test
| | * | | | | | | Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ↵Adam Powell2010-10-251-1/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpandableListViewBasicTest" into gingerbread
| | | * | | | | | | DO NOT MERGE Fix bug 3124899 - timeout in CTS testAdam Powell2010-10-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpandableListViewBasicTest A certain sequence of events could cause AbsListView to enter an infinite event loop. Only report reaching a scroll boundary to the overscroll code path if the Scroller wants to move further, not if we're done moving. Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
* | | | | | | | | | Merge "Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the ↵Marco Nelissen2010-10-254-0/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework. b/2764237"
| * | | | | | | | | | Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework.Marco Nelissen2010-10-254-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/2764237 Change-Id: I9a20974fa0b7527230258f7d0bf829a031673a9d
* | | | | | | | | | | Merge "increase sql statement printed in finalier warnings from 100 to 1000"Vasu Nori2010-10-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | increase sql statement printed in finalier warnings from 100 to 1000Vasu Nori2010-10-252-2/+2
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 100 for sql statement seems too small for some apps (gmail is one example) Change-Id: I4d29bffc0da5a854ca650d083b81df8769b35b77
* | | | | | | | | | | Merge "when printing cache-full warning, print the sql statements in cache"Vasu Nori2010-10-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | when printing cache-full warning, print the sql statements in cacheVasu Nori2010-10-251-0/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this should help debug developers in idetifying the sql statements taking up cache slots Change-Id: Ibc0140c273adc5c8d58ab359d2c4d4ce14b6b63b
* | | | | | | | | | Merge "Fix drags from the shirt pocket"Daniel Sandler2010-10-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix drags from the shirt pocketChris Tate2010-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startDrag() may only be called by/on a view that is in the window that is currently being touched. Change-Id: I5de158578dd3f75b5069e5af4f0726576adac4d4
* | | | | | | | | | | resolved conflicts for merge of 177b05d6 to masterScott Main2010-10-251-54/+58
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | | Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
| * | | | | | | | | am abb50f15: Merge "docs: fix a couple api links" into gingerbreadScott Main2010-10-251-55/+59
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp * commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd': docs: fix a couple api links
| | * | | | | | | | Merge "docs: fix a couple api links" into gingerbreadScott Main2010-10-251-55/+59
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | docs: fix a couple api linksScott Main2010-10-211-55/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0e35011a28dc87324e2d53e856cfcdb35236061
* | | | | | | | | | Merge "Fix ratingBarStyleSmall style in Holo theme."Adam Powell2010-10-251-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix ratingBarStyleSmall style in Holo theme.Mathew Inwood2010-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3123746 Change-Id: Icbfd5e2fcae7c1668e243c1b03a62ab31f42126b
* | | | | | | | | | am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion ↵Nick Pelly2010-10-253-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods." into gingerbread Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf' * commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf': Fixed NdefTag parcelable conversion methods.
| * | | | | | | | | am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into ↵Nick Pelly2010-10-253-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp * commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e': Fixed NdefTag parcelable conversion methods.
| | * | | | | | | | Merge "Fixed NdefTag parcelable conversion methods." into gingerbreadNick Pelly2010-10-253-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed NdefTag parcelable conversion methods.Sylvain Fonteneau2010-10-253-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed call to obsolete openTagConnection() method which was crashing. Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | | | | | | am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 ↵Wu-cheng Li2010-10-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workaround from CameraService.do not merge" into gingerbread Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5' * commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5': Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
| * | | | | | | | | am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from ↵Wu-cheng Li2010-10-252-11/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraService.do not merge" into gingerbread Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp * commit '89821204379816f6bee6902c4f132c014700c3b0': Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge