Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,659 Commits 3 Branches 0 Tags
69a1b6b17b47cc32e52b45e51719b4e01036b3ca
Commit Graph

30659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
69a1b6b17b Revert "update-api step missing from 65349" 
This reverts commit d6d15bcbac5e0e490662a371de52f00046626c5d.

Change-Id: Id7a7f0f539fe7d07ab1f5c7c72c0bce222e442d1
 2010-09-09 15:49:48 -07:00
Chet Haase
f47f8bc310 Merge "Fix bug with pivot point not including translationXY factors" 2010-09-09 15:39:46 -07:00
Chet Haase
897247b2c4 Fix bug with pivot point not including translationXY factors 
Change-Id: Ib16cd0acc007405fea24664327554019e24c2ac9
 2010-09-09 15:37:58 -07:00
Mike Lockwood
e611ad410a Merge "Use separate Uris for MTP to the media provider files table" 2010-09-09 15:37:31 -07:00
Gilles Debunne
cad0cffe24 update-api step missing from 65349 
Change-Id: Iaa3fc8fd67a48bb3b809b062a79e98965f15f937
 2010-09-09 14:58:52 -07:00
Jason Sams
127612855a Merge "Rework gl perf test to focus on important use cases." 2010-09-09 14:51:56 -07:00
Romain Guy
ddf719e519 Merge "Add support for advanced blend modes with the framebuffer." 2010-09-09 14:44:17 -07:00
Romain Guy
a5aed0d589 Add support for advanced blend modes with the framebuffer. 
This adds the ability to blend with the framebuffer using Darken,
Lighten, Add, Multiply, Overlay and Screen.

Change-Id: Iae01a53797d4ad39c373cba6ff2a42293129da1a
 2010-09-09 14:42:43 -07:00
Robert Greenwalt
c7c0acd1f5 Merge "Fix the build" 2010-09-09 14:26:38 -07:00
Gilles Debunne
0706f5058c am 2b88c5c7: am 47fa8e80: Fix for an IndentOutOfBounds in TextField. 
Merge commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434'

* commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434':
  Fix for an IndentOutOfBounds in TextField.
 2010-09-09 14:23:42 -07:00
Gilles Debunne
a3dac8b1dc am ca1b2615: am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread 
Merge commit 'ca1b26150943829a296bf38e55ff9c55dbd98182'

* commit 'ca1b26150943829a296bf38e55ff9c55dbd98182':
  Made context menu appear when tapping inside selection.
 2010-09-09 14:23:20 -07:00
Mathias Agopian
3748b718a4 am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into gingerbread 
Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c'

* commit '45bd99466ce9962778eacaefff1c0a44bb268f0c':
  option to enable multisampling
 2010-09-09 14:23:09 -07:00
Robert Greenwalt
67fd6c9292 Fix the build 
add '*' so javadoc recognizes a comment block and finds the required @hide..

Change-Id: If665ba6549f9e017c063ea2800b7970917c33bdf
 2010-09-09 14:22:59 -07:00
Steve Howard
c8532dac21 am 1ed20dc4: am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread 
Merge commit '1ed20dc43b070903597c55738f342bc77f7ab21d'

* commit '1ed20dc43b070903597c55738f342bc77f7ab21d':
  Hidden API to control sorting of download manager queries.
 2010-09-09 14:22:12 -07:00
Mathias Agopian
12e85311f4 am a9ff29b5: am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread 
Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0'

* commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0':
  Fix a few typos in EGL wrapper
 2010-09-09 14:21:55 -07:00
Jaikumar Ganesh
293de3eaf2 am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread 
Merge commit '049912b76f320c55cfe56394e520ee2c35f913b8'

* commit '049912b76f320c55cfe56394e520ee2c35f913b8':
  Fix to get A2DP to connect after unpairing
 2010-09-09 14:21:32 -07:00
Andreas Huber
f6b815409d am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 
Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'

* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
 2010-09-09 14:21:19 -07:00
James Dong
c4a43e2562 am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 
Merge commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412'

* commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412':
  When 32-bit offset is used,
 2010-09-09 14:21:07 -07:00
Gilles Debunne
3c5b56d46f Merge "resolved conflicts for merge of ff545380 to master" 2010-09-09 14:14:05 -07:00
Gilles Debunne
6eea4cd187 resolved conflicts for merge of ff545380 to master 
Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749
 2010-09-09 14:07:56 -07:00
Robert Greenwalt
057d5e9824 Fix the build 
broken merge resolution.

Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
 2010-09-09 14:05:10 -07:00
Andreas Huber
1560473ec1 am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread 
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
 2010-09-09 13:48:53 -07:00
John Wang
7e36e0c3b7 Merge "Fix SimUtilsTest after changing in bcdToString." 2010-09-09 13:39:43 -07:00
Robert Greenwalt
29c1ac170e Merge "resolved conflicts for merge of ec52c98d to master" 2010-09-09 13:37:42 -07:00
Christopher Tate
a8fe56adda Merge "Mute some spammy log messages from KeyButtonView" 2010-09-09 13:36:04 -07:00
Sang-il, Lee
b55df4471e Support MBCS characters in contacts and SMS messages that are stored in SIM cards. 
Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
 2010-09-09 13:23:42 -07:00
Robert Greenwalt
ca4306c976 resolved conflicts for merge of ec52c98d to master 
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
 2010-09-09 13:15:32 -07:00
Mike Lockwood
3e2d81cb73 Merge "MTP: Fix support for transfering folders and playlists." 2010-09-09 13:03:11 -07:00
Erik Gilling
980b38d2f5 Merge "surfaceflinger: give hwcomposer a chance to release buffers" 2010-09-09 13:01:27 -07:00
Erik Gilling
4b95ea0153 Merge "surfaceflinger: composite HWC_SKIP_LAYER layers" 2010-09-09 13:01:23 -07:00
Erik Gilling
1d3fc50ac0 Merge "surfaceflinger: unlock clients only after flip" 2010-09-09 13:01:18 -07:00
Mike Lockwood
8490e66f57 Use separate Uris for MTP to the media provider files table 
Separating the Uris for local and MTP access to the database will
allow us to handle MTP originated queries differently in the provider.

Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-09 16:00:22 -04:00
Mike Lockwood
792ec849e5 MTP: Fix support for transfering folders and playlists. 
This broke when I added support for transfering arbitrary files.

Change-Id: I6f2c052f3bd69839befcf0783d7aff5bcfd29b3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-09 15:59:56 -04:00
Adam Powell
14fdda3196 Merge "Fix bug 2988160 - Flinging broken in certain apps/widgets" 2010-09-09 12:26:16 -07:00
Christopher Tate
7a1a2f0e92 Mute some spammy log messages from KeyButtonView 
Change-Id: I6a254b6b9d611b3daaa9972a9d26a19c99e8572d
 2010-09-09 12:22:40 -07:00
Adam Powell
8ae0f3f6c7 Fix bug 2988160 - Flinging broken in certain apps/widgets 
Change-Id: I89de767cecbbc37cb2fe90a0346e8e1591dec60b
 2010-09-09 12:17:54 -07:00
Gilles Debunne
2b88c5c70d am 47fa8e80: Fix for an IndentOutOfBounds in TextField. 
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp

* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
  Fix for an IndentOutOfBounds in TextField.
 2010-09-09 12:14:59 -07:00
Gilles Debunne
47fa8e800c Fix for an IndentOutOfBounds in TextField. 
Bug http://b/issue?id=2971995

Change-Id: Id6a40e81b26e14c1e5f06ed1bd70ee419c501c69
 2010-09-09 12:10:41 -07:00
Antti Hatala
11042a41c1 surfaceflinger: give hwcomposer a chance to release buffers 
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
 2010-09-09 12:06:48 -07:00
Antti Hatala
982f58bdcc surfaceflinger: composite HWC_SKIP_LAYER layers 
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
 2010-09-09 12:06:31 -07:00
Antti Hatala
4c0a4a2b74 surfaceflinger: unlock clients only after flip 
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
 2010-09-09 12:06:18 -07:00
Gilles Debunne
ca1b261509 am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread 
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp

* commit '87e215fd54559935649fb07264ece600bbabbdf9':
  Made context menu appear when tapping inside selection.
 2010-09-09 12:00:52 -07:00
Mathias Agopian
45bd99466c am fec5d38b: Merge "option to enable multisampling" into gingerbread 
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp

* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
  option to enable multisampling
 2010-09-09 11:58:14 -07:00
Gilles Debunne
87e215fd54 Merge "Made context menu appear when tapping inside selection." into gingerbread 2010-09-09 11:56:28 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -07:00
Mathias Agopian
fec5d38baf Merge "option to enable multisampling" into gingerbread 2010-09-09 11:55:00 -07:00
Mathias Agopian
850753b6f4 option to enable multisampling 
multisampling can be enabled by specifying the number of
samples desired on the command line.

Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
 2010-09-09 11:53:17 -07:00
Romain Guy
a5682df238 Merge "Do not convert 8888 bitmaps to 565 when doing a copy." 2010-09-09 11:52:02 -07:00
Romain Guy
d90f23e24a Do not convert 8888 bitmaps to 565 when doing a copy. 
Bug #2988077
This change keeps the 8888 format for new bitmaps and also keeps,
when possible, the opaque flag.

Change-Id: Ia61f2e89936916b329212a4c59a7d815c329f84e
 2010-09-09 11:47:54 -07:00
Steve Howard
1ed20dc43b am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread 
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp

* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
  Hidden API to control sorting of download manager queries.
 2010-09-09 11:26:08 -07:00