ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,130 Commits 2 Branches 0 Tags 54 MiB
9479f3bb08
Commit Graph

42130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
441fbe0a4a am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 
* commit 'e589fc8984d2be7a8b78d78a5290c8fed014dcbd':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
 2011-12-06 08:49:53 -08:00
Jim Miller
dfa7dc74d9 am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 
* commit 'a3e3c4dd37139615adb88a38e6a99402e0cfcd2b':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
 2011-12-06 08:49:51 -08:00
George Mount
3a4756f60c Merge "Remove inFullScreenMode JNI call during drawGL call." 2011-12-06 08:42:07 -08:00
Claudia de Veaux
ac00c70f61 Merge "Edits to strings to meet UI text standards. * Use contractions. * Use \u2026 instead of ... for ellipsis. * Use straight quotes (for now that's the standard). * Made the permission descriptions consistent. * Use sentence case everywhere except for proper nouns. * Notification messages need ending punctuation. * Use "touch" instead of "tap". * Use "choose" instead of "select", except when selecting text. * Use "sign into" instead of "sign in to". * Use "Do you want..." instead of "Would you like..." * Autofill has only initial cap." 2011-12-06 08:27:11 -08:00
Brian Colonna
1024993b00 Merge "Making Face Unlock fix that wasn't proerly merged in master" 2011-12-06 07:25:59 -08:00
Jeff Brown
c18c2b28f9 am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 
* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
 2011-12-05 22:52:20 -08:00
Jeff Brown
3e22f421dc Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 2011-12-05 22:50:49 -08:00
Jim Miller
74015225ec am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
 2011-12-05 22:14:37 -08:00
Jim Miller
a389059345 Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 2011-12-05 22:12:54 -08:00
Jesse Hall
da06577eb9 am 2eb4a5ee: am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 
* commit '2eb4a5ee5bebf4120de217adf5a9f72b0c94951b':
  Fix statusbar crash on devices with no Bluetooth
 2011-12-05 21:27:30 -08:00
Jesse Hall
4759837dd3 am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 
* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
  Fix statusbar crash on devices with no Bluetooth
 2011-12-05 21:24:53 -08:00
Jesse Hall
ed7d42a38c Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 2011-12-05 21:23:29 -08:00
Jeff Brown
ee3e09badf Merge "Use a Choreographer to schedule animation and drawing." 2011-12-05 21:19:46 -08:00
Jeff Brown
64df4603c3 Merge "Add a new class to receive vsync events." 2011-12-05 21:19:41 -08:00
Jeff Brown
609b8fe6e1 Merge "Refactor ValueAnimator to reduce use of ThreadLocals." 2011-12-05 21:19:38 -08:00
Mathias Agopian
86884b9ae9 Merge "fix a deadlock when removing a DisplayEventConnection" 2011-12-05 21:14:03 -08:00
Jeff Brown
5256b636fe Merge "Harfbuzz assumes the length of the item is at least 1." 2011-12-05 20:43:55 -08:00
Jeff Brown
74feb15260 Merge "Ensure log_clusters array is big enough." 2011-12-05 20:43:36 -08:00
The Android Automerger
201a78f702 merge in ics-mr1-release history after reset to ics-mr1 2011-12-05 20:36:01 -08:00
Matthew Xie
9c21b297a7 am 12479141: am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 
* commit '12479141dd3e63a5f26a4509d0922c9ef9e3d78c':
  Broadcast turning on/off intent as early as possible when switch on/off BT
 2011-12-05 20:00:46 -08:00
Mathias Agopian
23748668d3 fix a deadlock when removing a DisplayEventConnection 
the deadlock would happen when the pipe became invalid and SF
trying to remove the connection from its list.

we know make sure to process events without holding a lock.

Change-Id: I39927ed8824fc7811e16db3c7608a2ebc72d9642
 2011-12-05 19:58:47 -08:00
Matthew Xie
5f2dca5822 am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
  Broadcast turning on/off intent as early as possible when switch on/off BT
 2011-12-05 19:58:12 -08:00
Matthew Xie
7f87a886c2 Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 2011-12-05 19:56:54 -08:00
Dianne Hackborn
1efc517621 am ec42750e: am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 
* commit 'ec42750e4d0e695515d078fb1f222c99a705fd93':
  Fix issue #5714517: App shortcuts can result in bad task intents
 2011-12-05 19:20:45 -08:00
Dianne Hackborn
4e6a13e794 am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
  Fix issue #5714517: App shortcuts can result in bad task intents
 2011-12-05 19:18:34 -08:00
Dianne Hackborn
de63dc278a Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 2011-12-05 19:16:54 -08:00
Dianne Hackborn
e624d861da am 24ec8703: am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 
* commit '24ec870322c801b0662d8b8d53232e89a94bc00a':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
 2011-12-05 19:11:23 -08:00
Dianne Hackborn
6d28bf7b30 am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
 2011-12-05 19:09:17 -08:00
Dianne Hackborn
e7c5236937 Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 2011-12-05 19:07:52 -08:00
Daniel Sandler
3fef2a473f am 83f79c90: am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 
* commit '83f79c90989bab2758d5c7d232eb537fb2242e8b':
  Fix sticky menu icon on tablet status bar.
 2011-12-05 19:06:17 -08:00
Daniel Sandler
481458b522 am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
  Fix sticky menu icon on tablet status bar.
 2011-12-05 19:04:13 -08:00
Daniel Sandler
a13e242710 Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 2011-12-05 19:02:28 -08:00
Adam Powell
cd1d2cbaa5 am 7cd1851d: am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 
* commit '7cd1851d82bc44acd1bd6d36f2a5f1ebccaefabf':
  Drop API level for notification compatibility BG to 8 (from 10)
 2011-12-05 17:49:04 -08:00
Adam Powell
757108a9d2 am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 
* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
  Drop API level for notification compatibility BG to 8 (from 10)
 2011-12-05 17:40:18 -08:00
Adam Powell
64fb290a92 Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 2011-12-05 17:38:23 -08:00
Eric Laurent
a9e0dc6caf am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 
* commit '5433e25f6ce013860ff2a074ad8d1158cc39ab91':
  audioflinger: fix audio skipping over A2DP
 2011-12-05 17:25:37 -08:00
Eric Laurent
19c54add1d am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
  audioflinger: fix audio skipping over A2DP
 2011-12-05 17:22:58 -08:00
Eric Laurent
cb512470c5 Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 2011-12-05 17:20:53 -08:00
Fred Quintana
60f369efb4 am f3f7d65b: am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 
* commit 'f3f7d65b650dec7f4eacefa1f0174fadfce5ec6e':
  By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
 2011-12-05 16:49:37 -08:00
Fred Quintana
0a5867d5bd am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 
* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
  By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
 2011-12-05 16:47:06 -08:00
Fred Quintana
9a6f415353 Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 2011-12-05 16:45:29 -08:00
Michael Kolb
931fcc613c am cda010d5: am 3124e6f9: Merge "Remove debug log messages" into ics-mr1 
* commit 'cda010d556552b533191d8bc90454c99c133549f':
  Remove debug log messages
 2011-12-05 16:33:01 -08:00
Xia Wang
a100397764 am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1 
* commit '96f660f4a8b99ff387e17474f2574e4e284ceeb8':
  Add extra 2 minute for wifi to shutdown
 2011-12-05 16:32:59 -08:00
Svetoslav Ganov
f64e8cbe5e am 96de4c3b: am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1 
* commit '96de4c3befe7cefac81b1d317f752ba76b9fe7ce':
  TalkBack does not announce properly the buttons of the PIN lock.
 2011-12-05 16:32:55 -08:00
Irfan Sheriff
0538089420 am f81674ca: am 6b66e9e4: Switch to notifications for walled garden 
* commit 'f81674ca5249313ce820ceb5329d82a2862abab6':
  Switch to notifications for walled garden
 2011-12-05 16:32:49 -08:00
Peter Ng
06f80d4511 am 9467d0bd: am 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1 
* commit '9467d0bde1e3b0065479f731236055e526664caa':
  Numberpicker section divider is now 2dp thick
 2011-12-05 16:32:44 -08:00
Eric Fischer
db56853fcb am ab50285a: am 845b3efc: Merge "Add missing locale date format files." into ics-mr1 
* commit 'ab50285ae481e9d749048e80a3d1e79f8545c1ed':
  Add missing locale date format files.
 2011-12-05 16:32:42 -08:00
Michael Kolb
d694297171 am 3124e6f9: Merge "Remove debug log messages" into ics-mr1 
* commit '3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
  Remove debug log messages
 2011-12-05 16:13:49 -08:00
Michael Kolb
fcc6543339 Merge "Remove debug log messages" into ics-mr1 2011-12-05 16:12:35 -08:00
Xia Wang
196a6826fb am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1 
* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
  Add extra 2 minute for wifi to shutdown
 2011-12-05 15:55:27 -08:00