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

41143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
a06a99a51a am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1 
* commit '7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
  Clean-up in TextView
 2011-11-15 13:07:14 -08:00
John Reck
ac6441256d am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1 
* commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
  Call onScrollChanged when scrolling layers
 2011-11-15 13:07:11 -08:00
Hong Teng
e8ccd41461 am 716747f7: 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 '716747f7cb29b45e41c2870f12d39095f4ed80c8':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 13:07:07 -08:00
Daniel Sandler
e99ef3e44d am 50fb8a29: am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1 
* commit '50fb8a29f00e4414ef4961c4d2d6afca9ddf1659':
  Bring back the 'more notifications' icon.
 2011-11-15 13:06:59 -08:00
Jean-Michel Trivi
cba2812100 am 87597d9c: am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '87597d9ce00691f05703f728c17548df2bbc9cc2':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 13:06:57 -08:00
Wu-cheng Li
ef133beadf am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1 
* commit '4e1fed76c19cc9656af55e57dc57979324322593':
  Improve camera face detection javadoc.
 2011-11-15 13:06:51 -08:00
Michael Jurka
7b48714cd2 am 729a9afe: am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1 
* commit '729a9afe44c21cbe4e10ca4d6ba400641cc75cbc':
  Updating recent apps visuals on tablet
 2011-11-15 11:30:36 -08:00
Jeff Sharkey
bab58ea3a0 am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 
* commit 'bc03c74c485669695805944a655795a6f9890956':
  Conservatively trim data usage stats.
 2011-11-15 11:30:34 -08:00
Nick Pelly
3a6ef30cce am 26eeedce: am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1 
* commit '26eeedceb12fa4d293f6e987115f0e2de54947b8':
  Move nfc-extras tests into frameworks/base/nfc-extras/tests.
 2011-11-15 11:30:22 -08:00
Adam Powell
a9c38cfbe3 am 5d536c94: am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 
* commit '5d536c945da075036f151e5dbac86d74d32e2fc9':
  Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
 2011-11-15 11:30:13 -08:00
Nick Pelly
018077739b am fb52c474: am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 
* commit 'fb52c4747687819238eb4570ee7d424842c6159f':
  Enforce 1-1 relationship between context and NfcAdapterExtras.
 2011-11-15 11:30:10 -08:00
Dianne Hackborn
3380c464ff am f1c78890: am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1 
* commit 'f1c78890dc703f44227b556e71624bed7eef95a1':
  Improve low memory reporting.
 2011-11-15 11:30:01 -08:00
Jeff Brown
e818039770 am 642de92b: am 9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1 
* commit '642de92b3500446ab2d2a84fbe4ff9c083e8c1af':
  Fix races when content providers are acquired and released.
 2011-11-15 11:29:59 -08:00
Dianne Hackborn
3f047a70a2 am 74710e50: am f10a5364: Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 
* commit '74710e5041045251c43ff408641ec6818d23f985':
  Maybe fix issue #5405788: Device continuously opening and closing...
 2011-11-15 11:29:57 -08:00
Daisuke Miyakawa
01c756a23d am f2213aca: am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 
* commit 'f2213acaae5073ea3b4f3f566f0e8c7dc976765b':
  Allow ContactsProvider to remove dulicates
 2011-11-15 11:29:51 -08:00
Jamie Gennis
7eb71ba8db am c38d40de: am 6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 
* commit 'c38d40ded9810aa809489e080ee811bec86d546d':
  EGL: add the ANDROID suffix to the blob cache ext
 2011-11-15 11:29:47 -08:00
Gilles Debunne
de6c104464 am 8a440477: Merge "Clean-up in TextView" into ics-mr1 
* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
  Clean-up in TextView
 2011-11-15 10:02:15 -08:00
Gilles Debunne
6f7ea17504 Merge "Clean-up in TextView" into ics-mr1 2011-11-15 09:59:45 -08:00
John Reck
44a59b2464 am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1 
* commit 'a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
  Call onScrollChanged when scrolling layers
 2011-11-15 09:58:48 -08:00
John Reck
8aad25a355 Merge "Call onScrollChanged when scrolling layers" into ics-mr1 2011-11-15 09:56:17 -08:00
Hong Teng
c72dcb1bc0 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:29 -08:00
Hong Teng
501fc74035 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
0f8f6fdd22 am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1 
* commit 'ce33622aed7fb25a14ef957cdc78b78cc4602be9':
  Bring back the 'more notifications' icon.
 2011-11-15 09:22:40 -08:00
Daniel Sandler
5ee4306964 Merge "Bring back the 'more notifications' icon." into ics-mr1 2011-11-15 09:20:56 -08:00
Jean-Michel Trivi
82c3030fe2 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 08:58:55 -08:00
Jean-Michel Trivi
f2e6bb27d5 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
ac0f6f5ae4 am b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1 
* commit 'b90a70d1542edd5a95e73b75192e6eb5a66401cc':
  Improve camera face detection javadoc.
 2011-11-15 06:16:21 -08:00
Wu-cheng Li
434213525a Merge "Improve camera face detection javadoc." into ics-mr1 2011-11-15 06:14:11 -08:00
Michael Jurka
42fb812a6c am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1 
* commit '4b7494e07a44c0aa363379be463de70455a895f3':
  Updating recent apps visuals on tablet
 2011-11-14 23:55:12 -08:00
Michael Jurka
a27d66819a Merge "Updating recent apps visuals on tablet" into ics-mr1 2011-11-14 23:53:34 -08:00
Jeff Sharkey
764f1a67b0 am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.
 2011-11-14 23:39:46 -08:00
Jeff Sharkey
d6a4be01a1 Merge "Conservatively trim data usage stats." into ics-mr1 2011-11-14 23:37:17 -08:00
Nick Pelly
d35098ace5 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-14 20:16:07 -08:00
Nick Pelly
f8255d8f6c Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1 2011-11-14 20:14:11 -08:00
Adam Powell
0aeb2a87de 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-14 19:49:39 -08:00
Adam Powell
a4a49056ab Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1 2011-11-14 19:47:55 -08:00
Nick Pelly
5bf9761f32 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-14 19:40:46 -08:00
Nick Pelly
c6e725bf86 Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 2011-11-14 19:39:09 -08:00
Dianne Hackborn
94765462e8 am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1 
* commit '91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
  Improve low memory reporting.
 2011-11-14 18:40:13 -08:00
Jeff Brown
d51c64e0b7 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-14 18:37:47 -08:00
Dianne Hackborn
f696eedf8e am f10a5364: Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 
* commit 'f10a53646044da31e73f5393d929c603871d4a28':
  Maybe fix issue #5405788: Device continuously opening and closing...
 2011-11-14 18:37:46 -08:00
Dianne Hackborn
987c8330af Merge "Improve low memory reporting." into ics-mr1 2011-11-14 18:36:50 -08:00
Jeff Brown
4d38d2538e Merge "Fix races when content providers are acquired and released." into ics-mr1 2011-11-14 18:35:57 -08:00
Dianne Hackborn
874f8ce777 Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1 2011-11-14 18:35:46 -08:00
Jeff Brown
4e8650d546 Merge "Clean up GenerationCache." 2011-11-14 18:28:59 -08:00
Daisuke Miyakawa
b65ed93ec9 am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 
* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
  Allow ContactsProvider to remove dulicates
 2011-11-14 17:56:47 -08:00
Daisuke Miyakawa
8e71118641 Merge "Allow ContactsProvider to remove dulicates" into ics-mr1 2011-11-14 17:54:17 -08:00
Jamie Gennis
57918ba883 am 6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 
* commit '6b228af6ff20b3f592db4ad5662e1bc401d09b4d':
  EGL: add the ANDROID suffix to the blob cache ext
 2011-11-14 17:41:20 -08:00
Jamie Gennis
7cd230c508 Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1 2011-11-14 17:36:46 -08:00
Steven Ross
989be2ec04 Merge "Making KeyguardView slippery fixes 5501105" 2011-11-14 16:56:46 -08:00