ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,515 Commits 2 Branches 0 Tags 54 MiB
1600a4b060
Commit Graph

33515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
1600a4b060 Merge "Refactoring of action bar internals" 2011-05-02 22:17:24 -07:00
Romain Guy
59591b9723 Merge "Allows to render with an OpenGL context inside a TextureView." 2011-05-02 18:33:26 -07:00
Mathias Agopian
5e1c464896 Merge "remove last traces of copybit" 2011-05-02 16:31:52 -07:00
Mathias Agopian
75c1535eb3 remove last traces of copybit 
Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
 2011-05-02 16:27:21 -07:00
Mike Lockwood
c01fd14880 Merge "MediaScanner: Add special casing of WMP album art files to isNoMediaPath()" 2011-05-02 16:09:26 -07:00
Robert Greenwalt
d27f9e0321 Merge "resolved conflicts for merge of db46fa25 to master" 2011-05-02 15:24:09 -07:00
Chet Haase
32034f2ec9 Merge "Line endcaps for AA lines are now antialiased." 2011-05-02 15:20:15 -07:00
Romain Guy
d3ff60d464 Merge "Remove unnecessary code." 2011-05-02 15:16:25 -07:00
Robert Greenwalt
b571f38927 resolved conflicts for merge of db46fa25 to master 
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
 2011-05-02 14:41:57 -07:00
Alex Sakhartchouk
de7be1a3e9 Merge "Moving renderscript GL code into the HAL This change affects - shaders - meshes - fonts - quad rendering" 2011-05-02 14:35:20 -07:00
Jason Sams
bc30781215 Merge "Temporarly disable auto-inbanding." 2011-05-02 14:33:05 -07:00
Mike Lockwood
b6d3de2d6d Merge "MediaScanner: Fix bug in "no media" handling logic" 2011-05-02 14:19:43 -07:00
Irfan Sheriff
50bd118429 am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 13:29:36 -07:00
Robert Greenwalt
8fa31b3a39 am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
62bcdb5f45 Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
2f31356a2a am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
b2531a836b Resolve merge conflicts for merge of 21083066 to master. 
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
 2011-05-02 12:13:44 -07:00
Wink Saville
3a1c7d2601 am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
  Fix bug in RIL#getDataCallState.
 2011-05-02 12:05:02 -07:00
Wink Saville
745fa56f9a am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Wink Saville
c2e50cd772 am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
  Fix bug in RIL#getDataCallState.
 2011-05-02 11:51:20 -07:00
Irfan Sheriff
581b155a43 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Wink Saville
9b81f6b0c1 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Conley Owens
e9981208de am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-05-02 10:37:40 -07:00
Conley Owens
8abc2b7d1a am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m 
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
  Scolling using arrow keys with padding
 2011-05-02 10:28:26 -07:00
Conley Owens
4c30f1027a Merge commit 'f395e304' into m 
Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
 2011-05-02 10:25:55 -07:00
Conley Owens
5511a49d8d am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit '08acaec6df66bd6a12b1e63016ed998abff4afdc':
  Fixed to draw texture when loadTexture() is called at first time
 2011-05-02 10:12:00 -07:00
Conley Owens
36f57da49a am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '737b5c58c9094e5759bd4162f23f73be2b71faaf':
  Fixing wrong Japanese phone formatter.
 2011-05-02 10:11:56 -07:00
Conley Owens
a46dda381f am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '1eb31b434fdc325c55b65ecf1783c63b2fdfa669':
  Fix memory leak of SkMovie class
 2011-05-02 10:11:52 -07:00
Conley Owens
6d1298f4f6 am 64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp 
* commit '64248af314593fe8ffed57ac9a0f43dede26bfc2':
  Implement support for ALT and SHIFT modifiers
 2011-05-02 10:11:48 -07:00
Conley Owens
8a335fe73f am c30d7676: am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal 
* commit 'c30d767628861b0bbea907824682e47732c820f9':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-05-02 10:11:43 -07:00
Conley Owens
3ddb5a11e3 am faedfc1e: Ignore slide ui change because it is obselete in newly-refactored code 
* commit 'faedfc1e9be10ab29d563b7aede57cdac6e44799':
  modify the device to enable to get the state as slide-open/slide-close.
 2011-05-02 10:11:39 -07:00
Conley Owens
de7c0f4727 am 238ef85e: am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" 
* commit '238ef85eb6894408c5a59cdb93405001c972f450':
  Adding missing breaks in BnSurfaceComposer::onTransact
 2011-05-02 10:11:34 -07:00
Conley Owens
6d9b67054f am 0921eae1: Ignore fix since it is obsolete in newly refactored code 
* commit '0921eae141eebbe52762d4a1cde0edf98fefbda2':
  Fixed to call computeVisibleRegions() when transparent value changed
 2011-05-02 10:11:29 -07:00
Conley Owens
1dd6ef0797 am 92618f5f: am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" 
* commit '92618f5fd9e4a0469d60cab39765b7c820c1976b':
  frameworks/base: acquire lock on am only when needed
 2011-05-02 10:11:11 -07:00
Conley Owens
96780f4ce5 Merge commit '5eb49e0f' into m 
Conflicts:
	core/java/com/android/internal/os/BatteryStatsImpl.java

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
 2011-05-02 09:59:30 -07:00
Conley Owens
aa2f34f478 am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" 
* commit 'ba40174bc02f35aa2f6339a04de4f8993f2cd750':
  Improved conversion accuracy of exif geotag data
 2011-04-29 18:08:16 -07:00
Conley Owens
0156ca81d9 am 33e86de0: Ignore broken image fix since identical change exists in internal tree 
* commit '33e86de0af31d16acda140d8dc45a256b2509211':
  Fixes broken image link in "Tools -> Traceview" documentation page.
 2011-04-29 18:08:06 -07:00
Conley Owens
ec732cdb6b Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
 2011-04-29 17:49:06 -07:00
Conley Owens
bc2d5e4146 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m 
Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
 2011-04-29 17:35:29 -07:00
Conley Owens
ecd5f1cc40 am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 17:15:39 -07:00
Conley Owens
7badf9c5e8 am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
  Fixed to draw texture when loadTexture() is called at first time
 2011-04-29 17:15:35 -07:00
Conley Owens
68bf2355c7 am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '520dd927cbe02ae52add1f90e282750582a9e95e':
  Fixing wrong Japanese phone formatter.
 2011-04-29 17:15:13 -07:00
Conley Owens
9b4283d6a2 am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '718516f3b73468c480ef8d2283a1c80a6223658d':
  Fix memory leak of SkMovie class
 2011-04-29 17:15:09 -07:00
Conley Owens
0273caeeaa Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp 2011-04-29 17:12:22 -07:00
Conley Owens
7eed38dc6c am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > 
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-04-29 17:07:14 -07:00
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