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

60327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Huang
68d7e0d2ab am e448f557: am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 
* commit 'e448f557f620ae30dcead7a4423059dfb7d70add':
  Update camera javadoc about AE and AWB lock.
 2011-09-23 10:07:33 -07:00
Wei Huang
e448f557f6 am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
 2011-09-23 10:05:22 -07:00
Wei Huang
3d9a9e55df Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
Eric Fischer
55df8eac24 am ec26232d: am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom 
* commit 'ec26232d70a342aa88e8190818b1b2973b20186e':
  Delete translations of files that no longer exist.
 2011-09-23 09:47:38 -07:00
Eric Fischer
ec26232d70 am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom 
* commit 'c4517842ee2a641342f151ecafb797080b9ed84d':
  Delete translations of files that no longer exist.
 2011-09-23 09:45:50 -07:00
Eric Fischer
c4517842ee Merge "Delete translations of files that no longer exist." into ics-factoryrom 2011-09-23 09:43:55 -07:00
Daniel Sandler
a399b03d09 am a8c46b1d: Merge "Put the correct background behind largeIcons." 
* commit 'a8c46b1dc47f0fa92f41c6311ca6131d18efbcd4':
  Put the correct background behind largeIcons.
 2011-09-23 09:35:18 -07:00
Daniel Sandler
a8c46b1dc4 Merge "Put the correct background behind largeIcons." 2011-09-23 09:33:18 -07:00
Pannag Sanketi
f5e4892e5f am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 
* commit '91d34137903c278e5e077fa1edef9bbbcdd140f7':
  Returning EOS in SurfaceMediaSource:read
 2011-09-23 09:10:41 -07:00
Pannag Sanketi
91d3413790 am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
  Returning EOS in SurfaceMediaSource:read
 2011-09-23 09:08:11 -07:00
Pannag Sanketi
1d71c7b40a Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 2011-09-23 09:06:55 -07:00
Mike Lockwood
78b19b4307 Merge "Add SerialPort.sendBreak()" into ics-aah 2011-09-23 09:02:20 -07:00
Mike Lockwood
6010dafe06 Add SerialPort.sendBreak() 
Change-Id: If25ba7724cf69489f2b04fc995baa9c164b5ea58
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-09-23 11:43:42 -04:00
Wei Huang
0205a57284 am 4cd34752: am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 
* commit '4cd34752cb229f3e1716e1e92f54f58dd847745c':
  Clear callbacks in camera stopPreview.
 2011-09-23 08:37:20 -07:00
Wei Huang
4cd34752cb am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
  Clear callbacks in camera stopPreview.
 2011-09-23 08:33:46 -07:00
Wei Huang
5d87227bad Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 2011-09-23 08:30:32 -07:00
Brandon Keely
de58b30891 am c56c9201: Merge "Make LockScreen ping() on a miss." 
* commit 'c56c92013c0acfa4517ed5d36d8aa78bc21452ae':
  Make LockScreen ping() on a miss.
 2011-09-23 07:47:57 -07:00
Brandon Keely
c56c92013c Merge "Make LockScreen ping() on a miss." 2011-09-23 07:46:30 -07:00
Justin Ho
0bd4e97881 am 092c339a: am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 
* commit '092c339ae704a4be9ff14b88b2ae31e06166374f':
  Updating ellipsis in Roboto Bug: 5344295
 2011-09-23 07:32:42 -07:00
Justin Ho
092c339ae7 am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 
* commit 'a780fb8e22d72b3f2c09b16eeddeff30e417ee3c':
  Updating ellipsis in Roboto Bug: 5344295
 2011-09-23 07:30:18 -07:00
Justin Ho
a780fb8e22 Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 2011-09-23 07:28:31 -07:00
Justin Ho
16faafb493 Updating ellipsis in Roboto 
Bug: 5344295

Change-Id: Ia885ff39da0609f51863665125bae3a1024e161c
 2011-09-23 07:27:35 -07:00
Chih-yu Huang
664d72e663 Clear callbacks in camera stopPreview. 
Clear those callbacks to remove the references
so the memory can be recycled.

bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
 2011-09-23 20:28:28 +08:00
Peter Ng
579506261b am b48ca1f1: am dd33bf0e: Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom 
* commit 'b48ca1f1ab8cf77db337d6f2bc8586cc172ab6f8':
  Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
 2011-09-22 23:44:51 -07:00
Robert Greenwalt
097e5f3710 am 511ecc8c: am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom 
* commit '511ecc8cf9f1b0660c4284f667cbc3807d2ebf82':
  Tell the resolver what protocols to use.
 2011-09-22 23:44:49 -07:00
Justin Ho
88b65d4995 am 006dc043: am 4dfe8695: Merge "CAB assets" into ics-factoryrom 
* commit '006dc043f0df929140ed71a28f4c401fa2e3bcd3':
  CAB assets
 2011-09-22 23:44:47 -07:00
Justin Ho
46845fb436 am 64edbc30: am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom 
* commit '64edbc30938cea722dfe3038c9db069f1c480acf':
  Updated emergency icon on lockscreen
 2011-09-22 23:44:45 -07:00
John Wang
85248df45e am 5298a8c7: am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom 
* commit '5298a8c71ae0125b32cc9e00062b9be370d9a043':
  Update PUK unlock screen.
 2011-09-22 23:44:43 -07:00
Adam Cohen
e8feb4a59c am a0c7a576: am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom 
* commit 'a0c7a5765dbbd255f9a122ba8829ca44032acde0':
  Fixing emergency dialer flicker on lock screen (issue 5314293)
 2011-09-22 23:44:41 -07:00
Justin Ho
0ba03bc350 am 83227a2d: am 31b638d4: Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom 
* commit '83227a2d067abd4b276289f62dc126dc3174ee10':
  Fix 5355659: Change chevron visuals, timing, and animated positioning
 2011-09-22 23:44:39 -07:00
Peter Ng
b48ca1f1ab am dd33bf0e: Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom 
* commit 'dd33bf0ebbde9aa702d039b6b9d5f06ac0a69dfb':
  Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
 2011-09-22 23:40:06 -07:00
Robert Greenwalt
511ecc8cf9 am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom 
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
  Tell the resolver what protocols to use.
 2011-09-22 23:39:53 -07:00
Justin Ho
006dc043f0 am 4dfe8695: Merge "CAB assets" into ics-factoryrom 
* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
  CAB assets
 2011-09-22 23:39:51 -07:00
Justin Ho
64edbc3093 am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom 
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
  Updated emergency icon on lockscreen
 2011-09-22 23:39:49 -07:00
John Wang
5298a8c71a am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom 
* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
  Update PUK unlock screen.
 2011-09-22 23:39:37 -07:00
Adam Cohen
a0c7a5765d am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom 
* commit '08ee7fa463aee5e83f77789e9a99f17a34ab68b4':
  Fixing emergency dialer flicker on lock screen (issue 5314293)
 2011-09-22 23:39:33 -07:00
Justin Ho
83227a2d06 am 31b638d4: Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom 
* commit '31b638d40342fc9e3198f9e7f8dffaf55049c9e1':
  Fix 5355659: Change chevron visuals, timing, and animated positioning
 2011-09-22 23:39:31 -07:00
Mathias Agopian
64fd7c7a10 am 0c92e4d7: Merge "don\'t clear the framebuffer when the framebuffer is not used" 
* commit '0c92e4d7474be3acf08038073d0e3b26ea643884':
  don't clear the framebuffer when the framebuffer is not used
 2011-09-22 21:04:22 -07:00
Mathias Agopian
7c1af6d31d am 9f12c8b4: Merge "fix dumpsys wording for h/w composer" 
* commit '9f12c8b47bc5d7ba12de90df78c026d93da5231d':
  fix dumpsys wording for h/w composer
 2011-09-22 21:02:27 -07:00
Mathias Agopian
0c92e4d747 Merge "don't clear the framebuffer when the framebuffer is not used" 2011-09-22 21:01:21 -07:00
Mathias Agopian
9f12c8b47b Merge "fix dumpsys wording for h/w composer" 2011-09-22 21:00:49 -07:00
Mathias Agopian
9fe96541c3 don't clear the framebuffer when the framebuffer is not used 
when areas of the FB are undefined (transparent windows on top of
nothing), we clear those areas before composition.
however, it makes no sense to do this when the FB is not in use
(case where hwc handles all layers)

Bug: 5360529
Change-Id: If51bb669307e8419bbe1f3a89d1c88e0ec1f216c
 2011-09-22 20:57:04 -07:00
Adam Powell
2fb627239a am 9b01e30c: Merge "Fix bug 5355912 - SearchView in ActionBar with Theme.Holo.Light.DarkActionBar gets black text" 
* commit '9b01e30ceaf76a0c2a20fe9398c0b1d295136e3a':
  Fix bug 5355912 - SearchView in ActionBar with Theme.Holo.Light.DarkActionBar gets black text
 2011-09-22 19:33:45 -07:00
Adam Powell
9b01e30cea Merge "Fix bug 5355912 - SearchView in ActionBar with Theme.Holo.Light.DarkActionBar gets black text" 2011-09-22 19:32:13 -07:00
Svetoslav Ganov
c82cd08aa5 am 1ac6b1e2: Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown." 
* commit '1ac6b1e221a76d7f09f47599449227e934d61d83':
  ActivityChooserView not showing "Show all" properly if the default target button not shown.
 2011-09-22 19:10:51 -07:00
Svetoslav Ganov
1ac6b1e221 Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown." 2011-09-22 19:08:26 -07:00
Adam Powell
d65b3b99f0 Fix bug 5355912 - SearchView in ActionBar with 
Theme.Holo.Light.DarkActionBar gets black text

Make sure that menus generated for use in action bars get themed correctly.

Change-Id: I14ba676d296c785514425d40d89e62dc4ff1da1a
 2011-09-22 18:53:15 -07:00
Peter Ng
dd33bf0ebb Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom 2011-09-22 17:28:29 -07:00
Chia-chi Yeh
c858cc108e am 1dc43b5c: Merge "ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty." 
* commit '1dc43b5cc5d37d3bd2a8dcd689d32e219f44d2fe':
  ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty.
 2011-09-22 17:27:27 -07:00
Chia-chi Yeh
1dc43b5cc5 Merge "ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty." 2011-09-22 17:25:27 -07:00