ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
40,660 Commits 2 Branches 0 Tags 54 MiB
63ece93954
Commit Graph

40660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
63ece93954 am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '7dc81e06e4d0554683595e8d2e318837548e249a':
  Import revised translations.  DO NOT MERGE
 2011-11-16 11:02:20 -08:00
Eric Fischer
dfc0992233 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:57:45 -08:00
Gilles Debunne
2391d860e9 am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1 
* commit 'de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
  IME action (done, next...) correctly handled
 2011-11-16 10:37:23 -08:00
Gilles Debunne
d5a6b7eb92 Merge "IME action (done, next...) correctly handled" into ics-mr1 2011-11-16 10:31:40 -08:00
Alex Sakhartchouk
189ba86523 am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 
* commit '4c593010dddc6d2972bab87b30bd1b11987a09e1':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
 2011-11-16 09:48:26 -08:00
Fred Chung
06a0aa5fc0 am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 
* commit '15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
  Bluetooth HDP sample.
 2011-11-16 09:48:20 -08:00
The Android Open Source Project
da2e97cb5a am 816e68e2: No-op merge from ics-mr0 
* commit '816e68e2fddd56c34f864dc5647801117a51720b':
 2011-11-16 09:48:16 -08:00
Alex Sakhartchouk
982596d4c4 Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 2011-11-16 09:40:11 -08:00
Fred Chung
4542525a45 Merge "Bluetooth HDP sample." into ics-mr1 2011-11-16 09:31:54 -08:00
The Android Open Source Project
2c707f9bb2 No-op merge from ics-mr0 
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
 2011-11-16 09:28:00 -08:00
The Android Open Source Project
9e566e2616 Reconcile with ics-factoryrom-2-release 
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
 2011-11-16 08:55:43 -08:00
The Android Open Source Project
d0dc0430b4 am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-16 07:38:11 -08:00
The Android Open Source Project
48792c7415 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
 2011-11-16 07:33:59 -08:00
Jake Hamby
fc8c80bd72 am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit 'bd7836846c1e5d3610ba6c26686674d429a4316c':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:19:34 -08:00
Bill Gruber
5996637ea7 am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:19:33 -08:00
Adrian Ludwig
3362d5ffc4 am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:19:30 -08:00
James Dong
b4508e6d2f am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:16:47 -08:00
Jake Hamby
6b78ee140f am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:16:12 -08:00
Bill Gruber
d9e8a1dca2 am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:16:02 -08:00
Adrian Ludwig
76976f7ec5 am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:15:57 -08:00
James Dong
54e3cf8e56 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Adam Powell
fee238308f am 45f05c95: Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 
* commit '45f05c9580739ffe2d665cec50efb0bb57d757ba':
  Fix bug 5623642 - Status bar background incompatible with some legacy apps
 2011-11-15 19:54:04 -08:00
Adam Powell
e5705c7f7a Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 2011-11-15 19:51:56 -08:00
Jeff Brown
d9a659d4e9 am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1 
* commit '3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
  Eliminate hw.keyboards system properties.
 2011-11-15 19:19:04 -08:00
Jeff Brown
032458cbab Merge "Eliminate hw.keyboards system properties." into ics-mr1 2011-11-15 19:17:09 -08:00
The Android Automerger
98dcfe2647 merge in ics-mr0-release history after reset to ics-mr0 2011-11-15 19:08:44 -08:00
Dianne Hackborn
d479bc9343 am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 
* commit 'cdec187a27b2acc34cd4df26b836b83362527d6a':
  Whoops, need to acquire lock.
 2011-11-15 19:06:20 -08:00
Dianne Hackborn
f81caa67c0 Merge "Whoops, need to acquire lock." into ics-mr1 2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
5dee8cef93 am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:21:44 -08:00
Jean-Michel Trivi
74266e51cf Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 2011-11-15 18:19:34 -08:00
Mathias Agopian
b034cbf1ba am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1 
* commit 'c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
  rework a bit how we manage EGL extensions
 2011-11-15 18:15:18 -08:00
Mathias Agopian
7288f91445 Merge "rework a bit how we manage EGL extensions" into ics-mr1 2011-11-15 18:12:00 -08:00
Jeff Brown
882b0a59d8 Eliminate hw.keyboards system properties. 
Stop using system properties to publish information about
the key character map path.  Instead, we can retrieve it
on demand by asking the window manager.

It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.

Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
 2011-11-15 18:00:10 -08:00
Jim Miller
5381517add am c57bfa4a: Fix 5581164: Add abbreviated localized date strings 
* commit 'c57bfa4a4bf4c810b5c663df17443463d8192e8f':
  Fix 5581164: Add abbreviated localized date strings
 2011-11-15 16:18:32 -08:00
Jim Miller
c1abda499d am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 
* commit '34a62348be92034a9fb7582e51754224785568dc':
  Fix 5581164: Use abbreviated day in lockscreen
 2011-11-15 15:44:17 -08:00
Jim Miller
403f92d906 Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00
Tsu Chiang Chuang
4ae425dc08 am cce32110: am d5897dc7: fix for build breakage. 
* commit 'cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
  fix for build breakage.
 2011-11-15 15:05:24 -08:00
Tsu Chiang Chuang
6a6ff2015d am d5897dc7: fix for build breakage. 
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
  fix for build breakage.
 2011-11-15 15:00:26 -08:00
Jim Miller
c76e9bd3e9 am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1 
* commit 'b35a21f987b99cfe90f4c46e0a708703274b8f46':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.
 2011-11-15 14:54:50 -08:00
Jim Miller
f8d578c485 Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1 2011-11-15 14:51:50 -08:00
Jeff Brown
2e96cf3079 am d5713179: Merge "Override app requested orientation when docked." into ics-mr1 
* commit 'd5713179a0f68aa47a8cd966abc5324d43414b63':
  Override app requested orientation when docked.
 2011-11-15 14:48:25 -08:00
Jeff Brown
fec867c117 Merge "Override app requested orientation when docked." into ics-mr1 2011-11-15 14:46:17 -08:00
Dianne Hackborn
4faf9e8b14 am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1 
* commit '5f11d73c918de72368ac5605c50f5fb9ac0457cb':
  Improve low memory dropbox reporting.
 2011-11-15 14:42:11 -08:00
Dianne Hackborn
6410350bc5 Merge "Improve low memory dropbox reporting." into ics-mr1 2011-11-15 14:39:37 -08:00
Jake Hamby
cf56976015 Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 2011-11-15 13:34:58 -08:00
Mathias Agopian
8a680e59e9 am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-15 13:06:08 -08:00
Mathias Agopian
04e1429aeb am 6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1 
* commit '6b3ce09d37fdb53a3a32e688017a5b343398c03b':
  fix crash when validating an invalid EGL objects
 2011-11-15 13:06:06 -08:00
Mathias Agopian
580a586150 Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-15 13:03:47 -08:00
Mathias Agopian
233c639ab8 Merge "fix crash when validating an invalid EGL objects" into ics-mr1 2011-11-15 13:03:22 -08:00
Winson Chung
f1af922a3d am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 
* commit 'e5129d7f49361df69e804a79696e28b213ea20b0':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)
 2011-11-15 12:45:18 -08:00