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

42232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
8b1893f69e am 5481142a: am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb 
* commit '5481142a0358f72c192d5a7e7f50cda77106309e':
  The .mkv parser lib leaves some tracks NULL if it doesn't support them.
 2011-01-24 13:37:40 -08:00
Huahui Wu
61b9649a50 am 6e4a69bb: am 94b8b114: Merge "A few small cleanning-ups." into honeycomb 
* commit '6e4a69bbf7d7566899ec76d2634538dd79ca4166':
  A few small cleanning-ups.
 2011-01-24 13:36:39 -08:00
Dianne Hackborn
d78da53334 am 21e7ba24: am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '21e7ba2451fdbc3e69468222638d5ee99eb44c30':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:36:33 -08:00
Daniel Sandler
751087c3b1 am c0d6b8d7: am 1e25a23f: Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 
* commit 'c0d6b8d7fb330c4e09a9e66967835a9a55804e8d':
  Vertically align SSID/PLMN on lockscreen.
 2011-01-24 13:33:00 -08:00
Justin Ho
07800cd4c2 am f8a93b4b: am 7040e33c: Merge "Updated checkbox assets for legacy applications" into honeycomb 
* commit 'f8a93b4ba2a73e5c8271d1fe23853b83a03e1583':
  Updated checkbox assets for legacy applications
 2011-01-24 13:32:52 -08:00
Andreas Huber
5481142a03 am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb 
* commit 'c45d3ad08469eb4c519a5aeef74f6d914e674144':
  The .mkv parser lib leaves some tracks NULL if it doesn't support them.
 2011-01-24 13:31:27 -08:00
Andreas Huber
b73f4208f0 am bd6ac1e4: am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb 
* commit 'bd6ac1e4d444e69d31677fec41d4d1a265098f08':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
 2011-01-24 13:31:00 -08:00
Santosh Madhava
01a9c0289e am 47254778: am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb 
* commit '47254778584db8d7a8b9ff17e3704fbdf18fa348':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
 2011-01-24 13:30:54 -08:00
Joe Onorato
b05aacc1ae am ab8967ae: am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb 
* commit 'ab8967ae9db71291094da2967e744038b7e91ff7':
  Remove unwanted parameter (it was a typo).
 2011-01-24 13:30:42 -08:00
Chet Haase
3873da3c6e am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb 
* commit '2acb67ec9fe34316231519373f59dfb76c03d57b':
  Use optimized display lists for all hwaccelerated rendering
 2011-01-24 13:30:37 -08:00
Daniel Sandler
222b8e2569 am 99b8041c: am 78b32fc4: Merge "Smoothly hide the list when there are no notifications." into honeycomb 
* commit '99b8041cc6bef1983f7a30adf0e2f0a751a18d3a':
  Smoothly hide the list when there are no notifications.
 2011-01-24 13:30:30 -08:00
Gilles Debunne
161bfdd0ce am 971bdb3a: am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb 
* commit '971bdb3a24582ab1f09745cdef1ec906ff13b7f9':
  New fix for popup behavior in AutoCompleteTextViews.
 2011-01-24 13:30:23 -08:00
satok
ff0ada3767 am 47f92f47: am 57ffc002: Add a way that subtype will be excluded from a last input method 
* commit '47f92f479cb2c6c18de4c1e429531d0c04e90472':
  Add a way that subtype will be excluded from a last input method
 2011-01-24 13:30:18 -08:00
Andreas Huber
c45d3ad084 Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb 2011-01-24 13:29:58 -08:00
Jean-Michel Trivi
477e035995 am dc871fd8: resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp 
* commit 'dc871fd870972bd704d720fae45bcbbcc5905173':
  Bug 3365937 notify TTS initialization listener of binding errors
 2011-01-24 13:29:58 -08:00
Eric Laurent
ea2d06d396 am f6a61c0a: (-s ours) am 39999e3a: (-s ours) am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread 
* commit 'f6a61c0abcf5834979245bb596f99f6257f43e5a':
  do not merge - Fix issue 3371096.
 2011-01-24 13:29:24 -08:00
Dianne Hackborn
995af7e38b am acba73c1: am 19fdccfd: (-s ours) am 11576102: Fix issue #3373438: Update GBMR versions 
* commit 'acba73c100e53c66bc45e87d8082a9b3e07e0cff':
  Fix issue #3373438: Update GBMR versions
 2011-01-24 13:28:55 -08:00
Huahui Wu
6e4a69bbf7 am 94b8b114: Merge "A few small cleanning-ups." into honeycomb 
* commit '94b8b114ab9abf5ccad6b85deb08aac2a359915d':
  A few small cleanning-ups.
 2011-01-24 13:27:25 -08:00
Gil Dobjanschi
dc5b1762da am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb 
* commit '6c170eccf2864e526a145c91102b204cb787c860':
  VideoEditor:Clear Surface API addition
 2011-01-24 13:27:07 -08:00
Dianne Hackborn
066db079a8 am 1eefe1fa: am 582a3944: Merge "Fix a regression in the wallpaper drawing." into honeycomb 
* commit '1eefe1facc5607d502c5bdd2c11c11acd2438666':
  Fix a regression in the wallpaper drawing.
 2011-01-24 13:27:00 -08:00
Adam Powell
9388442226 am caa54b39: am 77ddb026: Merge "Fix bug 3360953 - Toasts use the holo theme in non-HC apps" into honeycomb 
* commit 'caa54b391268e3ea81c69635d87aba34d129c84b':
  Fix bug 3360953 - Toasts use the holo theme in non-HC apps
 2011-01-24 13:26:52 -08:00
Adam Powell
003d248a52 am b3f079bc: am a6ce0819: Merge "Fix bug 3381275 - Too much padding on the left of a custom nav bar" into honeycomb 
* commit 'b3f079bc67a8d1d330c4ee6e348cb286118416da':
  Fix bug 3381275 - Too much padding on the left of a custom nav bar
 2011-01-24 13:26:43 -08:00
Huahui Wu
94b8b114ab Merge "A few small cleanning-ups." into honeycomb 2011-01-24 13:25:17 -08:00
Dianne Hackborn
21e7ba2451 am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:23:43 -08:00
Daniel Sandler
c0d6b8d7fb am 1e25a23f: Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 
* commit '1e25a23f9d5319267e48242b1dd655697da4a175':
  Vertically align SSID/PLMN on lockscreen.
 2011-01-24 13:16:38 -08:00
Joe Onorato
10f4126a36 resolved conflicts for merge of faf083ef to master 
Change-Id: I316a1b4356f6dba6c3880ccb02dbb2fa00d21a85
 2011-01-24 13:16:08 -08:00
Daniel Sandler
1e25a23f9d Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 2011-01-24 13:14:35 -08:00
Justin Ho
f8a93b4ba2 am 7040e33c: Merge "Updated checkbox assets for legacy applications" into honeycomb 
* commit '7040e33c183f431531bd68b23c6d69d31eb1a173':
  Updated checkbox assets for legacy applications
 2011-01-24 12:58:00 -08:00
Justin Ho
7040e33c18 Merge "Updated checkbox assets for legacy applications" into honeycomb 2011-01-24 12:55:29 -08:00
Daniel Sandler
bfa8983b65 Vertically align SSID/PLMN on lockscreen. 
Bug: 3373818
Change-Id: Ie20584c5247bd52e376ddcb97205ba967ce3a8ea
 2011-01-24 15:52:46 -05:00
Andreas Huber
dfe8d9b1ff The .mkv parser lib leaves some tracks NULL if it doesn't support them. 
But it still counts them as valid tracks...

Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
 2011-01-24 12:46:12 -08:00
Huahui Wu
f93246923f A few small cleanning-ups. 
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.

2. Remove the use of mDeferMultiTouch in DRT tests.

3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.

Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
 2011-01-24 12:07:37 -08:00
Justin Ho
ec42272205 Updated checkbox assets for legacy applications 
Change-Id: I30c39101b365a0bcc78e1b5ff67a9d2ae732e5ae
 2011-01-24 12:07:37 -08:00
Andreas Huber
bd6ac1e4d4 am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb 
* commit 'da6f9295840b0e74f61afa273ce2a767d8148af7':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
 2011-01-24 11:16:57 -08:00
Santosh Madhava
4725477858 am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb 
* commit '36486912595525a3ec4f0027deeb91d318ec4d9d':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
 2011-01-24 11:16:54 -08:00
Joe Onorato
ab8967ae9d am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb 
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
  Remove unwanted parameter (it was a typo).
 2011-01-24 11:16:43 -08:00
Chet Haase
2acb67ec9f am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb 
* commit '67005b05cc76a38a5b3bf6e83957dd03619e9126':
  Use optimized display lists for all hwaccelerated rendering
 2011-01-24 11:15:51 -08:00
Daniel Sandler
99b8041cc6 am 78b32fc4: Merge "Smoothly hide the list when there are no notifications." into honeycomb 
* commit '78b32fc4517f8fef8a73f9b31c9baa2e530ef8bc':
  Smoothly hide the list when there are no notifications.
 2011-01-24 11:15:42 -08:00
Gilles Debunne
971bdb3a24 am 7108724d: Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb 
* commit '7108724d4b6a1c2862154cd52ed4fb1e5f001186':
  New fix for popup behavior in AutoCompleteTextViews.
 2011-01-24 11:15:38 -08:00
satok
47f92f479c am 57ffc002: Add a way that subtype will be excluded from a last input method 
* commit '57ffc00239edcfe733832771e1429fca20182207':
  Add a way that subtype will be excluded from a last input method
 2011-01-24 11:15:20 -08:00
Andreas Huber
da6f929584 Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb 2011-01-24 10:45:59 -08:00
Santosh Madhava
3648691259 Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb 2011-01-24 10:45:36 -08:00
Joe Onorato
da34e13bb4 Merge "Remove unwanted parameter (it was a typo)." into honeycomb 2011-01-24 10:43:55 -08:00
Andreas Huber
aac2e9e156 Make AwesomePlayer's reset process more verbose to track down ANRs (again) 
Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9
related-to-bug: 3362836
 2011-01-24 10:31:52 -08:00
Santosh Madhava
4ff8a0b410 Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0' 
Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
 2011-01-24 10:17:05 -08:00
Jean-Michel Trivi
dc871fd870 resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp 
Change-Id: Ifd5f88f75feeb2dad1131e6a262dff3b979bdf8d
 2011-01-24 09:35:57 -08:00
Joe Onorato
e595cad6ee Remove unwanted parameter (it was a typo). 
Bug: 3241144
Change-Id: I569f6c8dffb17041a422be6084b6eab89624a57b
 2011-01-24 09:25:35 -08:00
Chet Haase
67005b05cc Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb 2011-01-24 09:24:59 -08:00
Daniel Sandler
78b32fc451 Merge "Smoothly hide the list when there are no notifications." into honeycomb 2011-01-24 08:59:08 -08:00
Gilles Debunne
7108724d4b Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb 2011-01-24 08:58:07 -08:00