ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,986 Commits 2 Branches 0 Tags 54 MiB
aa034b9445
Commit Graph

14986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Shan Emily Lau
f059f5c9f7 am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 
Merge commit '6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken

* commit '6e40664fc75e25ebeafda883fc2bba27279bebdd':
  Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
 2010-04-10 11:48:06 -07:00
Romain Guy
dac67195b9 am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 
Merge commit '376722fcdf41ade7286bcdb757564559d35a4976' into kraken

* commit '376722fcdf41ade7286bcdb757564559d35a4976':
  Fix regression introduced when fixing focus issue with ScrollView.
 2010-04-10 11:48:02 -07:00
Wink Saville
ec3bc500c6 am 19fe70cb: am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 
Merge commit '19fe70cbe70615d2d639fec2a2a3ab35d00d43ef' into kraken

* commit '19fe70cbe70615d2d639fec2a2a3ab35d00d43ef':
  Fix a FATAL ClassCastException in DataConnection.java
 2010-04-10 11:47:57 -07:00
Wei Huang
6d43712cbf am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 
Merge commit '997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken

* commit '997b38036f5ac5db69191d090c8c3c1d1b05aace':
  bug #2542580: add the appropriate mdpi asset for chat icon.
 2010-04-10 11:47:51 -07:00
Jesse Wilson
5dda520f80 am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken

* commit 'f9e90378d50210298d1cec2b913653597cd62be4':
  Move the public method HttpDateTime.parse() into AndroidHttpClient.
 2010-04-10 11:47:45 -07:00
Mike Reed
747a91a368 am 58d50183: am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo 
Merge commit '58d50183bc7c125db76f5ca8f76816ebb9f19d17' into kraken

* commit '58d50183bc7c125db76f5ca8f76816ebb9f19d17':
  final versions of these fonts from ascender, including GPOS 'mark' feature
 2010-04-10 11:47:40 -07:00
Robert Greenwalt
c90f0b636a am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo 
Merge commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b' into kraken

* commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b':
  Make ThrottleService notice policy changes.
 2010-04-10 11:47:35 -07:00
Dan Egnor
1081f91a21 am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 
Merge commit '505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken

* commit '505f22d1a4dbf1fceaf8deca443d7322386964e1':
  Fix sim build (sim doesn't have strl*() reliably...)
 2010-04-10 11:47:29 -07:00
Kristian Monsen
c58af6b44c am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 
Merge commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken

* commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31':
  Do not create intents for application/xhtml+xml
 2010-04-10 11:47:23 -07:00
Grace Kloba
79e351ecda am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo 
Merge commit '210462e57762be9bb016b4d05374cae5f48b5aea' into kraken

* commit '210462e57762be9bb016b4d05374cae5f48b5aea':
  Set mHeldMotionless to a new MOTIONLESS_IGNORE state
 2010-04-10 11:47:15 -07:00
Mathias Agopian
b282219d5e am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-10 11:43:17 -07:00
Wu-cheng Li
b19ad22c41 am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. 
Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp

* commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92':
  Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
 2010-04-10 11:42:15 -07:00
Scott Main
d60b0ca1f5 am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 
Merge commit '2a547829fe162c52ea1b1168f47d25fb1b40497d' into froyo-plus-aosp

* commit '2a547829fe162c52ea1b1168f47d25fb1b40497d':
  cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
 2010-04-10 11:42:10 -07:00
Dianne Hackborn
0d63616f22 am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 
Merge commit '17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp

* commit '17de1532a950f7ee961debab93a7977292b7f1f3':
  Fix issue #2581524: Car home icon should always go to car home
 2010-04-10 11:42:05 -07:00
Robert Greenwalt
768b5d31c0 am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo 
Merge commit '5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp

* commit '5cc072522b51f796085a73545a3dd34a02877059':
  Add warning magic to be a bit more reasonable.
 2010-04-10 11:42:02 -07:00
Yu Shan Emily Lau
913ae44953 am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 
Merge commit '15b02f04c7b5e895dd8ebbb9448863a7d608b00f' into froyo-plus-aosp

* commit '15b02f04c7b5e895dd8ebbb9448863a7d608b00f':
  Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
 2010-04-10 11:41:58 -07:00
Romain Guy
0bcb08c19f am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 
Merge commit '4525c98114c1e570ecef84521f66095e866af77d' into froyo-plus-aosp

* commit '4525c98114c1e570ecef84521f66095e866af77d':
  Fix regression introduced when fixing focus issue with ScrollView.
 2010-04-10 11:41:54 -07:00
Wink Saville
d579d794a7 am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 
Merge commit 'a18c824c029c14093b3d06d0a021c5397be667fb' into froyo-plus-aosp

* commit 'a18c824c029c14093b3d06d0a021c5397be667fb':
  Fix a FATAL ClassCastException in DataConnection.java
 2010-04-10 11:41:50 -07:00
Wei Huang
d52d0b0550 am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 
Merge commit 'c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da' into froyo-plus-aosp

* commit 'c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da':
  bug #2542580: add the appropriate mdpi asset for chat icon.
 2010-04-10 11:41:45 -07:00
Jesse Wilson
7e97d87b02 am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp

* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
  Move the public method HttpDateTime.parse() into AndroidHttpClient.
 2010-04-10 11:41:38 -07:00
Mike Reed
edc5c788be am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo 
Merge commit 'a3c4c219c21e61ca4a642a35610dea07c437a647' into froyo-plus-aosp

* commit 'a3c4c219c21e61ca4a642a35610dea07c437a647':
  final versions of these fonts from ascender, including GPOS 'mark' feature
 2010-04-10 11:41:30 -07:00
Robert Greenwalt
3420a62f0a am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo 
Merge commit '4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp

* commit '4dceedc133ef0487577badb67100d20473d87762':
  Make ThrottleService notice policy changes.
 2010-04-10 11:41:25 -07:00
Dan Egnor
e9675befc9 am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 
Merge commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp

* commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
  Fix sim build (sim doesn't have strl*() reliably...)
 2010-04-10 11:41:20 -07:00
Kristian Monsen
1716a441a4 am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp

* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
  Do not create intents for application/xhtml+xml
 2010-04-10 11:41:14 -07:00
Grace Kloba
ab9d21919b am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo 
Merge commit 'e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp

* commit 'e67e6b94fd282283f1ffa2299fae536bee099715':
  Set mHeldMotionless to a new MOTIONLESS_IGNORE state
 2010-04-10 11:41:09 -07:00
Mathias Agopian
b0d76cf4e1 am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-10 11:38:25 -07:00
Xavier Ducrohet
46cc16e6b0 Merge "README for layoutlib." 2010-04-09 18:34:16 -07:00
Scott Main
7765c25dfa Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 2010-04-09 17:03:55 -07:00
Dianne Hackborn
45888b7200 Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 2010-04-09 16:52:41 -07:00
Robert Greenwalt
533ebe2173 Merge "Add warning magic to be a bit more reasonable." into froyo 2010-04-09 16:47:10 -07:00
Yu Shan Emily Lau
22cbafc589 Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 2010-04-09 16:41:37 -07:00
Romain Guy
3d436720d2 Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-09 16:08:17 -07:00
Wink Saville
1a34d6c86d Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 2010-04-09 15:39:33 -07:00
Wei Huang
c3af71c8fd Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-09 15:34:46 -07:00
Mathias Agopian
365634dcbc Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-09 14:28:03 -07:00
Mathias Agopian
bf41b11ef8 small cleanup. gEGLImpl should have been static 
also added a ctor to initialized it in case we use it ont he stack
one day.

Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
 2010-04-09 14:26:07 -07:00
Romain Guy
236f011340 Merge "Don't supply a null child to the click listener. External bug #http://code.google.com/p/android/issues/detail?id=7644" 2010-04-09 14:09:42 -07:00
Jesse Wilson
533d354621 Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-09 14:01:07 -07:00
Jesse Wilson
fd472ba92c Move the public method HttpDateTime.parse() into AndroidHttpClient. 
See bug http://b/2553589

Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
 2010-04-09 13:34:15 -07:00
Mike Reed
75716915d0 Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo 2010-04-09 13:10:07 -07:00
Robert Greenwalt
9169ebd2d3 Merge "Make ThrottleService notice policy changes." into froyo 2010-04-09 13:00:05 -07:00
Dan Egnor
291444fdb6 Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo 2010-04-09 12:50:11 -07:00
Kristian Monsen
276ed8df4f Merge "Do not create intents for application/xhtml+xml" into froyo 2010-04-09 10:59:20 -07:00
Grace Kloba
51053fda45 Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo 2010-04-09 10:49:42 -07:00
Robert Greenwalt
d678325b2d am 49267612: am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 2010-04-09 09:44:14 -07:00
Robert Greenwalt
7e2ecccf68 am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 2010-04-09 09:39:59 -07:00
Robert Greenwalt
5bb4b0c9ca am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 
Merge commit 'a68780dd0f0af0938b72fdf6539db575da471028' into kraken

* commit 'a68780dd0f0af0938b72fdf6539db575da471028':
  Roaming data doesn't count against limits
 2010-04-09 09:35:55 -07:00
Robert Greenwalt
aa428ad6ef am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 
Merge commit 'cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp

* commit 'cb27041034343a6a15f0812d04f66fefbed30686':
  Roaming data doesn't count against limits
 2010-04-09 09:32:03 -07:00
Robert Greenwalt
e304ba1219 Merge "Roaming data doesn't count against limits" into froyo 2010-04-09 09:29:21 -07:00
Eric Laurent
d4ec1fa428 am 6bde88b9: am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-04-09 09:06:51 -07:00