ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
41,532 Commits 2 Branches 0 Tags 54 MiB
fca2839770
Commit Graph

41532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
4ef3648be8 Merge "Re-use SpanSets in TextLine" into ics-mr1 2011-12-08 17:58:24 -08:00
Joe Malin
9045e2e3c8 am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:46:44 -08:00
Joe Malin
2cbbddc0e1 am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:44:34 -08:00
Joe Malin
4eb44fe66d Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 2011-12-08 17:42:36 -08:00
The Android Automerger
6f41fea465 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:35:27 -08:00
Chia-chi Yeh
87f89d1850 am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-08 17:24:16 -08:00
Chia-chi Yeh
0c18a10c10 Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 2011-12-08 17:22:16 -08:00
Irfan Sheriff
7e4d6371a7 am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
  Fix wifi bring up at boot up
 2011-12-08 16:01:59 -08:00
Irfan Sheriff
e44371c6f1 Merge "Fix wifi bring up at boot up" into ics-mr1 2011-12-08 15:59:26 -08:00
Jake Hamby
4ca90a0b3c am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-08 15:53:42 -08:00
Jake Hamby
f73a44533e Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 2011-12-08 15:51:33 -08:00
Andreas Huber
2bf2a9874d am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit '68f592a8210af27df4339089bbee47fb602cae6a':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-08 13:35:53 -08:00
Andreas Huber
6eb807707f am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-08 13:35:51 -08:00
Andreas Huber
dabd58b008 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00
Andreas Huber
405aa649d8 Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 2011-12-08 13:33:06 -08:00
Svetoslav Ganov
baa3fcb45c am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 
* commit '48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
  NumberPicker getting stuck if scroll wheel not wrapable.
 2011-12-08 12:30:14 -08:00
Svetoslav Ganov
5355d06117 Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 2011-12-08 12:28:11 -08:00
Irfan Sheriff
4a91f6136f am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1 
* commit '583fdf0068ac46fb384a5aa2b193faf743f8221c':
  Handle emergency call back mode correctly
 2011-12-08 12:23:03 -08:00
Irfan Sheriff
807f51e4c2 Merge "Handle emergency call back mode correctly" into ics-mr1 2011-12-08 12:21:20 -08:00
Gilles Debunne
79443a17a9 am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1 
* commit 'aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
  Make the Next key navigate between TextViews
 2011-12-08 11:58:33 -08:00
Gilles Debunne
0703f733ee am 0e7b8020: Merge "Limit created string size in Spell Checker" into ics-mr1 
* commit '0e7b8020fd8607957844f7d67e8aaa6dc2ef816f':
  Limit created string size in Spell Checker
 2011-12-08 11:58:31 -08:00
Gilles Debunne
e8df1fe0fb Merge "Make the Next key navigate between TextViews" into ics-mr1 2011-12-08 11:57:06 -08:00
Gilles Debunne
64993fe81c Merge "Limit created string size in Spell Checker" into ics-mr1 2011-12-08 11:56:28 -08:00
Eric Fischer
1da214b25a am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'ab6b816a76c77f1ecd9a0ae911026aaba062f6d1':
  Import revised translations. DO NOT MERGE
 2011-12-08 11:11:06 -08:00
Eric Fischer
c88c1187ad Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:11 -08:00
The Android Open Source Project
65e2784b8a am 641a5624: Reconcile with ics-mr0-release 
* commit '641a5624075ee942b85b17646b57f65377567a06':
 2011-12-08 10:29:04 -08:00
The Android Open Source Project
1b487a6be1 Reconcile with ics-mr0-release 
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
 2011-12-08 10:26:33 -08:00
The Android Open Source Project
ddbd1fd2bd Reconcile with ics-mr0-release ics-mr1-release 
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
 2011-12-08 10:21:43 -08:00
Gilles Debunne
20cbf307bd am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
  IOOB is Suggestions
 2011-12-08 10:01:29 -08:00
Gilles Debunne
ff1defc308 am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
  Prevent NPE in SuggestionSpan
 2011-12-08 10:01:27 -08:00
Gilles Debunne
91e3720a47 Merge "IOOB is Suggestions" into ics-mr1 2011-12-08 09:59:44 -08:00
Gilles Debunne
5a63853ae8 Merge "Prevent NPE in SuggestionSpan" into ics-mr1 2011-12-08 09:59:29 -08:00
The Android Automerger
b6033fa64c merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 07:00:35 -08:00
Jeff Tinker
ecb836d33b am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-08 00:16:22 -08:00
Jeff Tinker
624c9bf09e Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Brown
e36321e70b am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
  Shortcut keys should be handled on down, not up.
 2011-12-07 23:31:03 -08:00
Jeff Brown
3e39ba7d94 am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit 'e0e9fd981ca71aeaa45c888485c11788456bd838':
  Fix system hotkey handling.
 2011-12-07 23:31:02 -08:00
Jeff Brown
6cdd6659a9 Merge "Shortcut keys should be handled on down, not up." into ics-mr1 2011-12-07 23:29:52 -08:00
Jeff Brown
515dd4d129 Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
Dave Burke
77a27ab257 am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
  Remove dangerous and useless optimization Bug #5525888
 2011-12-07 20:41:27 -08:00
Dave Burke
73b2d11e0d Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 2011-12-07 20:40:10 -08:00
Wink Saville
381cabe802 am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1 
* commit '234a5ef66275087aff9cfb94adc7608e9f358f11':
  When the SIM_READY set current preferred network type.
 2011-12-07 20:18:06 -08:00
Wink Saville
7f69cab4a8 Merge "When the SIM_READY set current preferred network type." into ics-mr1 2011-12-07 20:15:45 -08:00
Jaikumar Ganesh
f30ded7bac am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1 
* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.
 2011-12-07 19:52:11 -08:00
Jaikumar Ganesh
169fabc9bc Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -08:00
John Wang
49847e0667 am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1 
* commit 'ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
  Correct the dialing number of structured MMI.
 2011-12-07 18:51:11 -08:00
John Wang
8fdf67ce4b Merge "Correct the dialing number of structured MMI." into ics-mr1 2011-12-07 18:49:28 -08:00
Gilles Debunne
28e571c486 am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1 
* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale
 2011-12-07 18:42:04 -08:00
Gilles Debunne
19b1a8ae0c Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00
Adam Powell
022d04f12b am cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1 
* commit 'cf6a6522fdbce05896d3a551f7cd6243857ceced':
  Raise touch slop value from previous experiment
 2011-12-07 17:57:08 -08:00