Mathias Agopian
74c40c0a27
refactored screenshot code
...
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.
we also now have some client code to interface with the screenshot service.
it's now possible to request a screenshot at a lower resolution.
Change-Id: I5a3b0e431421800e3aad601d9af8f94adffbc71f
2010-09-29 16:55:15 -07:00
Ying Wang
11be2e62e2
Merge "Fix proguard flag file dependency." into gingerbread
2010-09-29 16:13:21 -07:00
Alex Sakhartchouk
41fca340ab
Merge "More robust attribute binding Adding attribute and uniform debug logging. Checking to see if aniso filtering is available."
2010-09-29 15:48:51 -07:00
Joe Onorato
0046c53725
am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread
...
Merge commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5' into gingerbread-plus-aosp
* commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5':
AnimatedImageView: Stop the animation when we're not visible.
2010-09-29 14:28:03 -07:00
Joe Onorato
e78c2bde02
Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread
2010-09-29 14:25:15 -07:00
David Brown
eeb9a9af5c
am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
...
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp
* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
Implement contacts lookup (caller-id) for incoming SIP calls.
2010-09-29 14:10:37 -07:00
David Brown
b3df9fdb39
Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
2010-09-29 14:08:31 -07:00
Doug Zongker
16f1ddba0f
am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
...
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp
* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -07:00
Doug Zongker
8a6b6a4a4b
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread
2010-09-29 13:41:00 -07:00
Romain Guy
e0d26fbac8
Merge "Add display lists caching."
2010-09-29 13:37:37 -07:00
Jaikumar Ganesh
c2a23c1a04
am a5c742bf: Merge "Update local cache before sending intent." into gingerbread
...
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp
* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
Update local cache before sending intent.
2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
6ddcbd2167
Merge "Update local cache before sending intent." into gingerbread
2010-09-29 13:24:53 -07:00
Nick Pelly
c389f05387
resolved conflicts for merge of f4c3b7e9 to master
...
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
2010-09-29 12:20:51 -07:00
Gilles Debunne
cd6b57c915
am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread
...
Merge commit 'f0fa267492353a98562d32d4359f2099df0f2fcd' into gingerbread-plus-aosp
* commit 'f0fa267492353a98562d32d4359f2099df0f2fcd':
New assets: wifi signal 1, no sim card.
2010-09-29 12:20:31 -07:00
Eric Fischer
10276a4b47
am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
...
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp
* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
Split strings with SD card references into variations.
2010-09-29 12:17:28 -07:00
Chia-chi Yeh
6acfce816d
am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread
...
Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp
* commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c':
RTP: Enable GSM-EFR codec.
2010-09-29 12:17:24 -07:00
Gilles Debunne
e84c62a323
Merge "New assets: wifi signal 1, no sim card." into gingerbread
2010-09-29 12:15:51 -07:00
Eric Fischer
c0e642476d
Merge "Split strings with SD card references into variations." into gingerbread
2010-09-29 12:14:10 -07:00
Chia-chi Yeh
2a7aea9d7e
Merge "RTP: Enable GSM-EFR codec." into gingerbread
2010-09-29 12:12:51 -07:00
Chia-chi Yeh
b5327a4ac0
am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
...
Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp
* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
RTP: Revise the workaround of private addresses and fix bugs.
2010-09-29 11:53:07 -07:00
Chia-chi Yeh
4c4d714225
Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
2010-09-29 11:50:16 -07:00
Joe Onorato
b93f6bad12
am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
...
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp
* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
2010-09-29 11:02:55 -07:00
Joe Onorato
8a663231b1
Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
2010-09-29 11:00:14 -07:00
Steve Block
0c6ac5b3c2
Merge "Update WebView useragent string for merge to WebKit r67908"
2010-09-29 10:42:30 -07:00
Roy West
fb46cd118b
am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
...
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp
* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
Partial fix to bug 2992589: Edit dev admin strings.
2010-09-29 10:40:06 -07:00
Roy West
89f7cfa16e
Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
2010-09-29 10:37:11 -07:00
Kenny Root
c3bc834a00
am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
...
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp
* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
Move all the permissions check up for unmount
2010-09-29 07:53:06 -07:00
Kenny Root
7b2f21e682
Merge "Move all the permissions check up for unmount" into gingerbread
2010-09-29 07:40:32 -07:00
Nick Pelly
6f76708405
am 038cabe0: NFC integration
...
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp
* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
NFC integration
2010-09-28 22:40:18 -07:00
Chia-chi Yeh
880d7ea41c
am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
...
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'
* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
2010-09-28 21:55:35 -07:00
Chia-chi Yeh
83c3741a90
am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
...
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp
* commit 'd6877fa4971710150de20453bf4ba54dca863429':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
2010-09-28 21:13:54 -07:00
Chia-chi Yeh
5be7524e14
Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
2010-09-28 21:11:27 -07:00
Mike Lockwood
7cc3fa0659
am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
...
Merge commit '05e110506156a1b782232833b907afb428802b69'
* commit '05e110506156a1b782232833b907afb428802b69':
Revert "Check for the DEVICE_POWER permission in userActivity."
2010-09-28 20:21:48 -07:00
Mike Lockwood
6f4ae27e33
am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
...
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp
* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
Revert "Check for the DEVICE_POWER permission in userActivity."
2010-09-28 20:18:36 -07:00
Mike Lockwood
a9bb401223
Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
2010-09-28 20:15:55 -07:00
Jaikumar Ganesh
135f19c8dc
Merge "New public APIs for BluetoothA2dp and BluetoothHeadset profiles."
2010-09-28 19:56:05 -07:00
Chia-chi Yeh
990d7c307d
am ebfe5632: am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread
...
Merge commit 'ebfe5632db275a89b49ab828064ba90db59702cf'
* commit 'ebfe5632db275a89b49ab828064ba90db59702cf':
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.
2010-09-28 19:47:07 -07:00
Chia-chi Yeh
90d2e41eef
am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread
...
Merge commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1' into gingerbread-plus-aosp
* commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1':
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.
2010-09-28 19:43:50 -07:00
Chia-chi Yeh
e708b34802
Merge changes Iae1913fb,I38dbefef into gingerbread
...
* changes:
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.
2010-09-28 19:40:59 -07:00
Jeff Hamilton
3dd49cb3d2
Merge "Add a Settings table to BrowserContract."
2010-09-28 19:15:44 -07:00
Jim Miller
16143ebe3b
Merge "Several improvements to RecentActivities:"
2010-09-28 18:46:01 -07:00
Dianne Hackborn
d3708c04bf
am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread
...
Merge commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4'
* commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4':
Remove old location classes.
2010-09-28 18:24:48 -07:00
Dianne Hackborn
7812878c68
am 3e94b94f: Merge "Remove old location classes." into gingerbread
...
Merge commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3' into gingerbread-plus-aosp
* commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3':
Remove old location classes.
2010-09-28 18:20:26 -07:00
Dianne Hackborn
ef3021c20e
Merge "Remove old location classes." into gingerbread
2010-09-28 18:16:58 -07:00
Kenny Root
4e37dad75a
resolved conflicts for merge of d8e8186c to master
...
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
2010-09-28 18:16:50 -07:00
Gil Dobjanschi
4585af5ce4
Merge "Save overlays to XML"
2010-09-28 18:00:55 -07:00
Winson Chung
f037fa6756
Merge "Making the calls to the RemoteViewsFactory synchronized to prevent threading issues."
2010-09-28 17:46:39 -07:00
Joe Onorato
d75675da3f
am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
...
Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d'
* commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d':
Check for the DEVICE_POWER permission in userActivity.
2010-09-28 17:40:23 -07:00
Joe Onorato
f547a54886
am 08a02039: am f2f34505: Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread
...
Merge commit '08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8'
* commit '08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8':
Fix 3041579 overscroll effect in notification area looks strange
2010-09-28 17:40:18 -07:00
Dianne Hackborn
42ae774410
am e5317fbd: am 4f67e1cc: Merge "Add location shared library for location provider APIs." into gingerbread
...
Merge commit 'e5317fbd48875896e04a34d955edf650f11f9771'
* commit 'e5317fbd48875896e04a34d955edf650f11f9771':
Add location shared library for location provider APIs.
2010-09-28 17:40:02 -07:00