ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
40,852 Commits 2 Branches 0 Tags 54 MiB
11cb4c04a3
Commit Graph

40852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f3600e569a Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 2011-12-13 13:38:56 -08:00
Gilles Debunne
366d1432ed Merge "NPE in GMail / TextLine" into ics-mr1 2011-12-13 13:37:29 -08:00
Scott Main
db20a9b152 am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
  Created Android University lesson for Multiple APKs.
 2011-12-13 13:10:45 -08:00
Scott Main
568bf65826 am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 13:10:42 -08:00
Scott Main
f07b37cde6 Merge "Created Android University lesson for Multiple APKs." into ics-mr0 2011-12-13 12:25:38 -08:00
Andreas Huber
3ef0a52028 Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 2011-12-13 11:59:50 -08:00
Jeff Sharkey
b4d1ec8d9d Merge "Avoid NPE when missing network stats." into ics-mr1 2011-12-12 20:19:27 -08:00
Mike Cleron
ee5de0ffff Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Dianne Hackborn
ff934866fc Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 2011-12-12 16:09:54 -08:00
Gilles Debunne
8754c8f146 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
8d1381027d Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Adam Powell
3786085f8e Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 2011-12-12 15:40:00 -08:00
Jamie Gennis
07584d6321 Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 2011-12-12 14:10:04 -08:00
Raphael
afcfa2f23a Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 2011-12-12 13:14:12 -08:00
Matthew Xie
027bd44923 Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 2011-12-12 12:07:39 -08:00
Eric Fischer
0beca4d419 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-12 11:04:39 -08:00
Justin Ho
1504118362 Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 2011-12-09 15:42:10 -08:00
Jamie Gennis
988637e559 SurfaceTexture: fix a verbose-log compile error 
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
 2011-12-09 15:07:44 -08:00
Jeff Tinker
7052519a97 Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 2011-12-09 11:11:56 -08:00
Joe Fernandez
f0ac62bfe9 am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '89c3bc38421a3f01b39f0246e53884bdf8b14415':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-09 10:45:44 -08:00
Joe Fernandez
da1d9aa974 Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 2011-12-09 10:43:32 -08:00
Gilles Debunne
09743f40ad Merge "Blinking cursor in Talk" into ics-mr1 2011-12-09 09:34:04 -08:00
Gilles Debunne
61685f375f Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 2011-12-08 18:18:25 -08:00
Gilles Debunne
4ef3648be8 Merge "Re-use SpanSets in TextLine" into ics-mr1 2011-12-08 17:58:24 -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
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
e44371c6f1 Merge "Fix wifi bring up at boot up" into ics-mr1 2011-12-08 15:59:26 -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
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
5355d06117 Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 2011-12-08 12:28:11 -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
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
c88c1187ad Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:11 -08:00
The Android Open Source Project
1b487a6be1 Reconcile with ics-mr0-release 
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
 2011-12-08 10:26:33 -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
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
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
73b2d11e0d Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 2011-12-07 20:40:10 -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
169fabc9bc Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -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
19b1a8ae0c Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00
Adam Powell
85b41d50a2 Merge "Raise touch slop value from previous experiment" into ics-mr1 2011-12-07 17:55:35 -08:00
Daniel Sandler
7a73f3a5fd Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 2011-12-07 17:40:07 -08:00
Joe Malin
a9f2453392 am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
  DOC CHANGE: Add text for android.os.storage
 2011-12-07 17:11:59 -08:00