drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,124 Commits 1 Branch 0 Tags
Commit Graph

64124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
811131db6f 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:14:51 -08:00
Mathias Agopian
c0fa2a3bce Merge "rework a bit how we manage EGL extensions" into ics-mr1 2011-11-15 18:12:00 -08:00
Jim Miller
c545019b5c am c57bfa4a: Fix 5581164: Add abbreviated localized date strings 
* commit 'c57bfa4a4bf4c810b5c663df17443463d8192e8f':
  Fix 5581164: Add abbreviated localized date strings
 2011-11-15 16:18:44 -08:00
Jim Miller
c57bfa4a4b Fix 5581164: Add abbreviated localized date strings 
Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
 2011-11-15 16:06:37 -08:00
Jim Miller
b96a45e0d2 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:21 -08:00
Jim Miller
34a62348be Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00
Tsu Chiang Chuang
0172a3a069 am cce32110: am d5897dc7: fix for build breakage. 
* commit 'cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
  fix for build breakage.
 2011-11-15 15:05:44 -08:00
Tsu Chiang Chuang
cce32110e6 am d5897dc7: fix for build breakage. 
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
  fix for build breakage.
 2011-11-15 15:00:26 -08:00
Jim Miller
42928f8476 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:54 -08:00
Jim Miller
b35a21f987 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
09ab6aa2d2 am d5713179: Merge "Override app requested orientation when docked." into ics-mr1 
* commit 'd5713179a0f68aa47a8cd966abc5324d43414b63':
  Override app requested orientation when docked.
 2011-11-15 14:47:47 -08:00
Jeff Brown
d5713179a0 Merge "Override app requested orientation when docked." into ics-mr1 2011-11-15 14:46:17 -08:00
Dianne Hackborn
6cc19eae6b am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1 
* commit '5f11d73c918de72368ac5605c50f5fb9ac0457cb':
  Improve low memory dropbox reporting.
 2011-11-15 14:42:13 -08:00
Dianne Hackborn
5f11d73c91 Merge "Improve low memory dropbox reporting." into ics-mr1 2011-11-15 14:39:37 -08:00
Dianne Hackborn
d8c98fee02 Improve low memory dropbox reporting. 
The msg is now constructed to try to bin these reports in
interesting ways.  We'll see.  Also change the tag name from
watchdog to lowmem, since sharkey is kindly taking care of
the back-end to handle this.

Improve how we put processes into low memory states to better
poke things like home and the previous app.

Also clean up some debug output, and add a few new am comment
options for controlling the current debug app.

Change-Id: I562a931a95244a2727bb7a6e1fd80dec259cdae2
 2011-11-15 14:15:58 -08:00
Jeff Brown
dec6cf4f30 Override app requested orientation when docked. 
Applies to docks, lid switch, HDMI and rotation lock.
We always choose a mode that is compatible with the application's
request, so if in a landscape dock, we might override a request
for seascape but we leave requests for portrait alone.

Bug: 5620454
Change-Id: Ib0c4f60f7f9e3aeafaba9c717233a950fccb8af2
 2011-11-15 14:14:02 -08:00
Mathias Agopian
d38f57d3d9 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:05:46 -08:00
Mathias Agopian
f45de7ae35 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:05:44 -08:00
Mathias Agopian
3aa684ec0d Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-15 13:03:47 -08:00
Mathias Agopian
6b3ce09d37 Merge "fix crash when validating an invalid EGL objects" into ics-mr1 2011-11-15 13:03:22 -08:00
Winson Chung
2120eb3830 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:43:49 -08:00
Winson Chung
e5129d7f49 Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 2011-11-15 12:41:56 -08:00
Danielle Millett
8887bbb17c am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 
* commit '4900001670c5229fa06e57821a3436023c25520d':
  DO NOT MERGE cherry picking from MR0 cl 148223
 2011-11-15 12:20:48 -08:00
Danielle Millett
4900001670 am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 
* commit '8d8e669ea11d011b3e2320ad5dab580916b6d32e':
  DO NOT MERGE cherry picking from MR0 cl 148223
 2011-11-15 12:16:59 -08:00
Eric Fischer
14d171b844 am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '3524831a633693cf72880299706b2039d41c3b78':
  Import revised translations.  DO NOT MERGE
 2011-11-15 11:55:40 -08:00
Eric Fischer
3524831a63 am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
  Import revised translations.  DO NOT MERGE
 2011-11-15 11:51:38 -08:00
Tsu Chiang Chuang
a8d4fddc04 am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit 'b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
  Adding mobile microbenchmark tests.
 2011-11-15 11:14:18 -08:00
Tsu Chiang Chuang
b3f2890a8a am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit '047c4de2c548960fff428a92099003593cede5f8':
  Adding mobile microbenchmark tests.
 2011-11-15 11:10:44 -08:00
Gilles Debunne
8d0d468fd2 am 8a440477: Merge "Clean-up in TextView" into ics-mr1 
* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
  Clean-up in TextView
 2011-11-15 10:01:21 -08:00
Gilles Debunne
8a440477fd Merge "Clean-up in TextView" into ics-mr1 2011-11-15 09:59:45 -08:00
John Reck
46fc72eb9d am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1 
* commit 'a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
  Call onScrollChanged when scrolling layers
 2011-11-15 09:58:49 -08:00
John Reck
a0c6bf5af6 Merge "Call onScrollChanged when scrolling layers" into ics-mr1 2011-11-15 09:56:17 -08:00
Hong Teng
3f84160e95 am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 
* commit '481ffa505bb1d8f5089ea98e3b5960d409b6819c':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 09:45:24 -08:00
Hong Teng
481ffa505b Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 2011-11-15 09:42:37 -08:00
Daniel Sandler
802e9227ab am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1 
* commit 'ce33622aed7fb25a14ef957cdc78b78cc4602be9':
  Bring back the 'more notifications' icon.
 2011-11-15 09:26:04 -08:00
Jean-Michel Trivi
0dba46f9b2 am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 09:26:02 -08:00
Wu-cheng Li
5975fe1e17 am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1 
* commit 'b90a70d1542edd5a95e73b75192e6eb5a66401cc':
  Improve camera face detection javadoc.
 2011-11-15 09:25:57 -08:00
Michael Jurka
2502262ddf am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1 
* commit '4b7494e07a44c0aa363379be463de70455a895f3':
  Updating recent apps visuals on tablet
 2011-11-15 09:25:47 -08:00
Jeff Sharkey
ebf8c5d3ee am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.
 2011-11-15 09:25:40 -08:00
Nick Pelly
a3fdfbf321 am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1 
* commit 'b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
  Move nfc-extras tests into frameworks/base/nfc-extras/tests.
 2011-11-15 09:25:32 -08:00
Adam Powell
23861b5cca am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 
* commit '539bcca99d00166303245cd8137f49f29ff3f08e':
  Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
 2011-11-15 09:25:27 -08:00
Nick Pelly
f6df8ae09d am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 
* commit 'a26cf3011157eb94fa2766e76fa0096628c16c18':
  Enforce 1-1 relationship between context and NfcAdapterExtras.
 2011-11-15 09:25:24 -08:00
Dianne Hackborn
0dfae92851 am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1 
* commit '91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
  Improve low memory reporting.
 2011-11-15 09:25:20 -08:00
Jeff Brown
14684154b1 am 9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1 
* commit '9058435dc1a741030c042c4d6f2512f5d1605e5d':
  Fix races when content providers are acquired and released.
 2011-11-15 09:25:18 -08:00
Daniel Sandler
ce33622aed Merge "Bring back the 'more notifications' icon." into ics-mr1 2011-11-15 09:20:56 -08:00
Jean-Michel Trivi
538dc6acfd Merge "Fix 5615747 Don't leak remote control client death handlers" into ics-mr1 2011-11-15 08:56:55 -08:00
Wu-cheng Li
b90a70d154 Merge "Improve camera face detection javadoc." into ics-mr1 2011-11-15 06:14:11 -08:00
Wu-cheng Li
8c13670c13 Improve camera face detection javadoc. 
bug:4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
 2011-11-15 17:55:37 +08:00
Michael Jurka
4b7494e07a Merge "Updating recent apps visuals on tablet" into ics-mr1 2011-11-14 23:53:34 -08:00
Michael Jurka
bfd24acd31 Updating recent apps visuals on tablet 
- getting rid of blue glow (5529032)
- moving app icon position
- show message if there are no recent apps (5533332)
- fixing rare IllegalStateException on orientation change (5584344)

Change-Id: I2210e584957869c8f02339e6841daf39364a9dad
 2011-11-14 23:49:10 -08:00