Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,852 Commits 3 Branches 0 Tags
76fc56fb6576a545449c3e9a1f2a2aca81f28e23
Commit Graph

21852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
76fc56fb65 am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. 2010-04-10 11:55:00 -07:00
Scott Main
f63d616b38 am 8e60e092: am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 2010-04-10 11:54:56 -07:00
Dianne Hackborn
7c48d939e2 am e1b462d7: am 06af7620: am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 2010-04-10 11:54:51 -07:00
Robert Greenwalt
890a53c9d8 am 6890bfba: am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo 2010-04-10 11:54:47 -07:00
Yu Shan Emily Lau
5b1b4993d3 am 45c566e9: am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 2010-04-10 11:54:42 -07:00
Romain Guy
aa03df8afc am 50e0d9ae: am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-10 11:54:36 -07:00
Wink Saville
d5f8da30d1 am 472ba185: am 19fe70cb: am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 2010-04-10 11:54:30 -07:00
Wei Huang
235af29996 am 92671e5e: am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-10 11:54:25 -07:00
Jesse Wilson
97a22e1b44 am 86b0276a: am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-10 11:54:19 -07:00
Mike Reed
1e5b95ad88 am 1064a131: am 58d50183: am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo 2010-04-10 11:54:13 -07:00
Robert Greenwalt
b049ab29ae am 82052192: am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo 2010-04-10 11:54:05 -07:00
Dan Egnor
ca39b95d54 am aeeea3da: am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 2010-04-10 11:53:59 -07:00
Kristian Monsen
2843b0e3a6 am 53f772ed: am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 2010-04-10 11:53:52 -07:00
Grace Kloba
6fd142421d am 449491ce: 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. 2010-04-10 11:53:46 -07:00
Wu-cheng Li
926d9a89ed am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. 
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken

* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
  Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
 2010-04-10 11:48:24 -07:00
Scott Main
8e60e09219 am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken

* commit '67d6590d242397acbb95814139301d2e6efd3631':
  cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
 2010-04-10 11:48:20 -07:00
Dianne Hackborn
e1b462d76d am 06af7620: am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 
Merge commit '06af762033467bb578b9ed2be8af580cc11505a8' into kraken

* commit '06af762033467bb578b9ed2be8af580cc11505a8':
  Fix issue #2581524: Car home icon should always go to car home
 2010-04-10 11:48:15 -07:00
Robert Greenwalt
6890bfba4f am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo 
Merge commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e' into kraken

* commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e':
  Add warning magic to be a bit more reasonable.
 2010-04-10 11:48:11 -07:00
Yu Shan Emily Lau
45c566e98a 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
50e0d9ae31 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
472ba18537 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
92671e5e4d 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
86b0276a39 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
1064a13181 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
82052192c5 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
aeeea3da3c 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
53f772eddb 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
449491ced0 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
Wu-cheng Li
08caa704ae 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
67d6590d24 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
06af762033 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
52ebff3c47 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
6e40664fc7 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
376722fcdf 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
19fe70cbe7 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
997b38036f 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
f9e90378d5 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
58d50183bc 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
090af2c570 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
505f22d1a4 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
d25fb8db8d 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
210462e577 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
c0fa658952 am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-10 11:38:25 -07:00
Wu-cheng Li
c58b42327d Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. 
bug:2544367
Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
 2010-04-10 09:33:15 +08:00
Scott Main
2a547829fe Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 2010-04-09 17:03:55 -07:00
Dianne Hackborn
17de1532a9 Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 2010-04-09 16:52:41 -07:00
Dianne Hackborn
f5c5d22c47 Fix issue #2581524: Car home icon should always go to car home 
Rework how switching between modes work so the caller can tell us
whether they want to go to home.  (So car home launcher can now
tell us they always want to go home.)

Change-Id: Id4a8129027d6d162b4bae6f983911f1f4bf2578f
 2010-04-09 16:49:08 -07:00
Robert Greenwalt
5cc072522b Merge "Add warning magic to be a bit more reasonable." into froyo 2010-04-09 16:47:10 -07:00
Yu Shan Emily Lau
15b02f04c7 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
4525c98114 Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-09 16:08:17 -07:00