summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | am a47c4019: Merge "Add RouteInfo objects for tracking routes." into ↵Robert Greenwalt2011-05-0210-75/+324
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'a47c40193fcbe9ca07facea78b2828afdae5e025': Add RouteInfo objects for tracking routes.
| | | * | | | | | | | | | | | | | Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTERobert Greenwalt2011-05-0210-75/+324
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Add RouteInfo objects for tracking routes.Robert Greenwalt2011-05-0210-75/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to have list of gateways for default routes, but general static routes should be supported. Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
* | | | | | | | | | | | | | | | | | Merge "Line endcaps for AA lines are now antialiased."Chet Haase2011-05-027-65/+225
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Line endcaps for AA lines are now antialiased.Chet Haase2011-05-027-65/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed other minor issues with AA and line rendering. Change-Id: Icd4638d27c70e2ee0f28b5d9a2b97d8b29e8ac4d
* | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary code."Romain Guy2011-05-021-144/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove unnecessary code.Romain Guy2011-05-021-144/+38
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0352bf861192df51fe78873d439e8d7ff887118e
* | | | | | | | | | | | | | | | | | | Merge "Moving renderscript GL code into the HAL This change affects - ↵Alex Sakhartchouk2011-05-0235-986/+1549
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shaders - meshes - fonts - quad rendering"
| * | | | | | | | | | | | | | | | | | | Moving renderscript GL code into the HALAlex Sakhartchouk2011-04-2935-986/+1549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change affects - shaders - meshes - fonts - quad rendering Change-Id: I2a53acb4cd1fa8f4c6e67668f6ee969f3d7f7aa1
* | | | | | | | | | | | | | | | | | | | Merge "Temporarly disable auto-inbanding."Jason Sams2011-05-021-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Temporarly disable auto-inbanding.Jason Sams2011-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia83389c094914f0bb69bff8f6965ae445c89de07
* | | | | | | | | | | | | | | | | | | Merge "MediaScanner: Fix bug in "no media" handling logic"Mike Lockwood2011-05-021-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't let the "no media" status of one directory leak to the remaining files and directories in the same parent. Bug: 4364077 Change-Id: I30943222dc292818cff00ee8169be7a695eed174 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | | | | | | am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with ↵Irfan Sheriff2011-05-024-131/+545
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dhcpcd" into honeycomb-LTE * commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f': Add DhcpStateMachine for interation with dhcpcd
| * | | | | | | | | | | | | | | | | am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into ↵Irfan Sheriff2011-05-024-131/+545
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4': Add DhcpStateMachine for interation with dhcpcd
| | * | | | | | | | | | | | | | | | Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTEIrfan Sheriff2011-05-024-131/+545
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Add DhcpStateMachine for interation with dhcpcdIrfan Sheriff2011-04-304-131/+545
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Supports wakeup and renewal on dhcp - Supports multiple controllers to use the state machine simultaneously - Optionally, a controller can request a notification prior to DHCP request/renewal being sent Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
* | | | | | | | | | | | | | | | | | Resolve merge conflicts for merge of 21083066 to master.Wink Saville2011-05-022-48/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
| * | | | | | | | | | | | | | | | | am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTEWink Saville2011-05-022-59/+164
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e74c60db5261ea137c8f6672f8573873eb5814e': Enhance AsyncChannel.
| | * | | | | | | | | | | | | | | | Merge "Enhance AsyncChannel." into honeycomb-LTEWink Saville2011-05-022-59/+164
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Enhance AsyncChannel.Wink Saville2011-05-022-59/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Protocol for BASE of CMD's. - Add synchronous connect methods. - Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
* | | | | | | | | | | | | | | | | | | am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState.Wink Saville2011-05-021-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | * commit '0fa7d106d4e34559c6e208f731c319cf681c0583': Fix bug in RIL#getDataCallState.
| * | | | | | | | | | | | | | | | | am aa44b52e: Fix bug in RIL#getDataCallState.Wink Saville2011-05-021-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f': Fix bug in RIL#getDataCallState.
| | * | | | | | | | | | | | | | | | Fix bug in RIL#getDataCallState.Wink Saville2011-05-021-2/+3
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I568e25d85888aa40b6a0b5e7f2d016e409f73ce1
* | | | | | | | | | | | | | | | | am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable ↵Conley Owens2011-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value" * commit 'a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08': Adjust mBiggerTouchSlopSquare to the suitable value
| * | | | | | | | | | | | | | | | Merged "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-293-5/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/view/ViewConfiguration.java Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
| | * | | | | | | | | | | | | | | am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-293-5/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5': Adjust mBiggerTouchSlopSquare to the suitable value
| | | * | | | | | | | | | | | | | Merge "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-293-5/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Adjust mBiggerTouchSlopSquare to the suitable valueMasanori Ogino2011-02-073-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the scaling factor is larger than 1.0 (i.e. 1.5), then mTouchSlopSquare(576) is bigger than mBiggerTouchSlopSquare(400). The double tap condition should be bigger than a single tap's one. This causes the fail of the following CTS test cases in the device has over 240 density. - android.view.cts.GestureDetectorTest * testOnTouchEvent - android.view.cts.GestureDetector_SimpleOnGestureListenerTest * testSimpleOnGestureListener To fix this issue, I'll add a new public method ViewConfiguration#getScaledLargeTouchSlop() then the value returned from that method is used as a slop area of mLargeTouchSlop. Change-Id: I0e61c13670e1300be1ccf45a89ef89410496fb48
* | | | | | | | | | | | | | | | | | am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with ↵Conley Owens2011-05-025-6/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | padding) into m * commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158': Scolling using arrow keys with padding
| * | | | | | | | | | | | | | | | | Merge commit 'b737647d' (Scrolling using arrow keys with padding) into mConley Owens2011-04-295-6/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/widget/ScrollView.java Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
| | * | | | | | | | | | | | | | | | am 76616b13: Merge "Scolling using arrow keys with padding"Conley Owens2011-04-295-6/+132
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '76616b138eb68a77a838a93fdf2f0322e982f706': Scolling using arrow keys with padding
| | | * | | | | | | | | | | | | | | Merge "Scolling using arrow keys with padding"Conley Owens2011-04-295-6/+132
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Scolling using arrow keys with paddingMattias Petersson2011-04-075-6/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was impossible to reach the end of a large test when scrolling down using the arrowkeys when the ScrollView had padding. A common example of this would be an AlertDialog with a text that is too long to fit on the screen. Change-Id: I55464290a0cdeabde83ccccc76fe8d015ae57a8d
* | | | | | | | | | | | | | | | | | | Merge commit 'f395e304' into mConley Owens2011-05-022-3/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/tests/coretests/src/android/text/TextUtilsTest.java Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
| * | | | | | | | | | | | | | | | | am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null ↵Conley Owens2011-04-292-3/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string" * commit '19653c6440eaf7328ecbc01c3ca6d7a910906484': CHAR_SEQUENCE_CREATOR cannot handle null string
| | * | | | | | | | | | | | | | | | am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"Conley Owens2011-04-292-3/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '425db473a05e4204301bf46d4ab6f51b12d9c447': CHAR_SEQUENCE_CREATOR cannot handle null string
| | | * | | | | | | | | | | | | | | Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"Conley Owens2011-04-292-3/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | CHAR_SEQUENCE_CREATOR cannot handle null stringMartin Wallgren2011-04-072-3/+55
| | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextUtils.writeToParcel can handle null as input CharSequence but createFromParcel will throw NullPointerException. Transforming to and from parcel should handle null in the same way. Change-Id: I707ea9be2091d2655c5f63eaa57c5674befa5ad3
* | | | | | | | | | | | | | | | | | am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when ↵Conley Owens2011-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loadTexture() is called at first time" * commit '08acaec6df66bd6a12b1e63016ed998abff4afdc': Fixed to draw texture when loadTexture() is called at first time
| * | | | | | | | | | | | | | | | | am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is ↵Conley Owens2011-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called at first time" * commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a': Fixed to draw texture when loadTexture() is called at first time
| | * | | | | | | | | | | | | | | | am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at ↵Conley Owens2011-04-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first time" * commit '58e4a5e2094c5003225fc715ee1a53b2461e71b1': Fixed to draw texture when loadTexture() is called at first time
| | | * | | | | | | | | | | | | | | Merge "Fixed to draw texture when loadTexture() is called at first time"Conley Owens2011-04-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fixed to draw texture when loadTexture() is called at first timeIchitaro Kohara2011-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SW renderer of Stagefright reaches loadTexture() to draw image. The first time loadTexture() is called, it just initializes OGL texture, then returns. Thus, the first time call doesn't draw. This patch fixes to move on to draw stage after the initialization. Change-Id: I3ec1ad68fb8d376a4ad7aefded1c18a002d175c4
* | | | | | | | | | | | | | | | | | | am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone ↵Conley Owens2011-05-021-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatter." * commit '737b5c58c9094e5759bd4162f23f73be2b71faaf': Fixing wrong Japanese phone formatter.
| * | | | | | | | | | | | | | | | | | am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '520dd927cbe02ae52add1f90e282750582a9e95e': Fixing wrong Japanese phone formatter.
| | * | | | | | | | | | | | | | | | | am 9355a24a: Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9355a24af2a4985902f1e9ab4233df3fb831ef72': Fixing wrong Japanese phone formatter.
| | | * | | | | | | | | | | | | | | | Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Fixing wrong Japanese phone formatter.Keiji Ariyama2011-03-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=15383 Adding rules that Japanese number start with 050 and 060. Change-Id: Id324d7ecfb18b348230a3903b356647045700d80
* | | | | | | | | | | | | | | | | | | | am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"Conley Owens2011-05-022-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1eb31b434fdc325c55b65ecf1783c63b2fdfa669': Fix memory leak of SkMovie class