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

41168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
afd9d7c9d8 Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN." 2011-11-15 13:52:47 -08:00
Jeff Brown
43aca01c91 Merge "POWER key is always a wake key." 2011-11-15 13:39:56 -08:00
Mathias Agopian
029f760674 am 556a406c: am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '556a406cf4dd8a7faa318e0d522d899f8b9da7dc':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-15 13:11:19 -08:00
Mathias Agopian
5db8b4221d am a0d32c4d: am 6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1 
* commit 'a0d32c4d094704fd6f4ccd3cba297a7c7d2f38fe':
  fix crash when validating an invalid EGL objects
 2011-11-15 13:11:17 -08:00
Winson Chung
0974b9c27f am 9ebb030a: am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 
* commit '9ebb030ad9eeb94bdf9e15b7a3f55d9792dda96b':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)
 2011-11-15 13:11:14 -08:00
Danielle Millett
6146364668 am 8b6b92ea: (-s ours) am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 
* commit '8b6b92ea5e257cd9d5799b74f64e7e1cc1ca3ddc':
  DO NOT MERGE cherry picking from MR0 cl 148223
 2011-11-15 13:11:08 -08:00
Eric Fischer
c7db9869ed am 66adcedb: (-s ours) am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '66adcedbc635bbce37a849824d0cefceab810535':
  Import revised translations.  DO NOT MERGE
 2011-11-15 13:10:56 -08:00
Tsu Chiang Chuang
7464a47beb am 06e4a400: am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit '06e4a40017f1af75ec58d9d942ef0c4ddad20fd2':
  Adding mobile microbenchmark tests.
 2011-11-15 13:07:26 -08:00
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
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
Winson Chung
1dc1b96dc5 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
edebb6e705 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:21:01 -08:00
Danielle Millett
4a22c4e3fa 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
d6553a5ddc 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:54 -08:00
Eric Fischer
7ec7256cd7 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
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
Tsu Chiang Chuang
1ad7f913fd am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit 'b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
  Adding mobile microbenchmark tests.
 2011-11-15 11:13:45 -08:00
Tsu Chiang Chuang
164e08265a 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
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