30849 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
962e482606 Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 2010-09-10 14:36:21 -07:00
Mathias Agopian
795155ae42 Merge "Add support for KHR_fence_sync" 2010-09-10 14:29:26 -07:00
Vasu Nori
196663234a remove unnecessary synchronization object from SQLiteClosable.
and a couple of other minor SMP fixes

Change-Id: I62bb4dd2fe43fc41074454a25bd84ad1fb4d004d
2010-09-10 14:27:06 -07:00
Nipun Kwatra
35c8b532e5 Merge "Added specific resolution and time lapse profiles." 2010-09-10 14:26:45 -07:00
Jean-Baptiste Queru
7c65585feb Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 2010-09-10 14:25:14 -07:00
Nipun Kwatra
9d619542be Adding hasProfile.
- Added hasProfile to CamcorderProfile and JNI.
- Added hasCamcorderProfile to MediaProfiles.
- using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera
  in get().

Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
2010-09-10 14:22:11 -07:00
Nipun Kwatra
4af0dfd6cb Added specific resolution and time lapse profiles.
- Added enums QUALITY_{QCIF,480P,720P,1080P}
  QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile
  and corresponding ones in MediaProfiles.
- Added functions createDefaultCamcorderTimeLapseLowProfile,
  createDefaultCamcorderTimeLapseHighProfile to set default values.
- Moved javadoc for constants to the get() function.

Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
2010-09-10 14:22:08 -07:00
Gilles Debunne
ddea348daa am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp

* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
  Changed menu and expandedMenu background color to dark.
2010-09-10 14:19:50 -07:00
Gilles Debunne
e262ab2f79 Merge "Changed menu and expandedMenu background color to dark." into gingerbread 2010-09-10 14:16:29 -07:00
Brad Fitzpatrick
37fc8cc7b8 am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread
Merge commit 'b724d2519a900744a477bd57df6a2f8703c87e72' into gingerbread-plus-aosp

* commit 'b724d2519a900744a477bd57df6a2f8703c87e72':
  Enable strictmode logging in system_server & add a lock.
2010-09-10 14:08:58 -07:00
Jesse Wilson
30f163e4d9 am 86333015: Merge "Delete AWT from frameworks/base." into gingerbread
Merge commit '863330154e8d42e688ffda02c497f53d8b213a2d' into gingerbread-plus-aosp

* commit '863330154e8d42e688ffda02c497f53d8b213a2d':
  Delete AWT from frameworks/base.
2010-09-10 14:06:10 -07:00
Brad Fitzpatrick
b724d2519a Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 2010-09-10 14:05:57 -07:00
Jesse Wilson
863330154e Merge "Delete AWT from frameworks/base." into gingerbread 2010-09-10 14:04:01 -07:00
Joe Onorato
38f75b97d9 am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE
Merge commit '58300000c1867eaf10fbfb91c53d1b86a37f5b47' into gingerbread-plus-aosp

* commit '58300000c1867eaf10fbfb91c53d1b86a37f5b47':
  This was already deprecated, but not picked up by the tool DO NOT MERGE
2010-09-10 14:03:28 -07:00
Mathias Agopian
9ca8a84c67 Add support for KHR_fence_sync
Change-Id: Ie2771b5869c9c8dcf5ecf9318e2ee6d4d1cd5cc9
2010-09-10 14:01:45 -07:00
Joe Onorato
58300000c1 This was already deprecated, but not picked up by the tool DO NOT MERGE
Change-Id: I4740a37039d0817a7f433f169ac2afc074101533
2010-09-10 16:58:58 -04:00
Gilles Debunne
26b16f3946 Changed menu and expandedMenu background color to dark.
Change-Id: I662e635c49a4a80295a2f11ccd9406301ffd831d
2010-09-10 13:51:22 -07:00
Vasu Nori
bcd3387eed Merge "Return count of rows in a resultset only once (when startPos = 0)" 2010-09-10 13:45:45 -07:00
Vasu Nori
b18f27dbf4 Return count of rows in a resultset only once (when startPos = 0)
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
2010-09-10 13:43:19 -07:00
Eric Fischer
e7be8e8f6c am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473' into gingerbread-plus-aosp

* commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473':
  Import revised translations.  DO NOT MERGE
2010-09-10 13:21:26 -07:00
Eric Fischer
b6a007c5cd Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-10 13:18:37 -07:00
Eric Fischer
41c2489ee1 Import revised translations. DO NOT MERGE
Change-Id: Ia93fc0d7ab89ff0ccf09f183ae0c9366ce72f9d0
2010-09-10 13:04:39 -07:00
Brett Chabot
0194eeabfe am 4940ff85: Update to new ddmlib-prebuilt api.
Merge commit '4940ff85d561310d2c122ca6bd7de4d00772b095' into gingerbread-plus-aosp

* commit '4940ff85d561310d2c122ca6bd7de4d00772b095':
  Update to new ddmlib-prebuilt api.
2010-09-10 13:03:57 -07:00
Xavier Ducrohet
fa8887848e am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp

* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
  Avoid pre-processing images when they won't be used
2010-09-10 13:03:43 -07:00
Jean-Baptiste Queru
e3dabc4bc4 am beeb71df: fix build
Merge commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2' into gingerbread-plus-aosp

* commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2':
  fix build
2010-09-10 13:03:38 -07:00
Jean-Baptiste Queru
03b3eda2f8 am 862438eb: fix build
Merge commit '862438eb69297accde289230f4c4623b56a39458' into gingerbread-plus-aosp

* commit '862438eb69297accde289230f4c4623b56a39458':
  fix build
2010-09-10 13:03:33 -07:00
Jean-Baptiste Queru
3b3d2160b7 am 7547b8ea: fix build
Merge commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c' into gingerbread-plus-aosp

* commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c':
  fix build
2010-09-10 13:03:29 -07:00
Jean-Baptiste Queru
6fc97b3500 am 93548db6: fix build
Merge commit '93548db645dd4fd2b9c1dd270421ac0b38de720e' into gingerbread-plus-aosp

* commit '93548db645dd4fd2b9c1dd270421ac0b38de720e':
  fix build
2010-09-10 13:03:24 -07:00
Joe Onorato
aa03045e63 Make @deprecated without comment an error.
Change-Id: Iaa5289fe7b48f0349fa9708c4f05144f6340b11c
2010-09-10 15:55:44 -04:00
Joe Onorato
201480c50e Fix the last remaining @deprecated tag without comment warning.
Change-Id: I526707233652e8092b33357d08f8ed81cd3a9e14
2010-09-10 15:55:43 -04:00
Joe Onorato
ebdac324a8 am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread
Merge commit '81fe092d11607912944a49c47df6c14e28a977b8' into gingerbread-plus-aosp

* commit '81fe092d11607912944a49c47df6c14e28a977b8':
  Make @deprecated without a comment an error DO NOT MERGE
2010-09-10 12:49:15 -07:00
Jean-Baptiste Queru
3802949f5c Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
2010-09-10 12:46:57 -07:00
Joe Onorato
fb71733b35 am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp

* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
  Fix the last remaining @deprecated tag without comment warning.
2010-09-10 12:46:52 -07:00
Joe Onorato
81fe092d11 Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 2010-09-10 12:45:18 -07:00
Joe Onorato
7c8258d064 Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 2010-09-10 12:44:36 -07:00
Scott Main
4cf0f45d65 am 3b202844: am 51c18989: docs: update platform dashboard
Merge commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64' into gingerbread-plus-aosp

* commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64':
  docs: update platform dashboard
2010-09-10 12:39:57 -07:00
Scott Main
3b202844fe am 51c18989: docs: update platform dashboard
Merge commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068' into gingerbread

* commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068':
  docs: update platform dashboard
2010-09-10 12:34:06 -07:00
Joe Onorato
e94f6db177 Make @deprecated without a comment an error DO NOT MERGE
(do not merge because in master, this error has a different code 114 instead of 14)

Change-Id: Iffc58423a8e972f3f59edfe6668beac4b65182e0
2010-09-10 15:02:06 -04:00
Joe Onorato
4d8cc7bdf4 Fix the last remaining @deprecated tag without comment warning.
Change-Id: Id4c50dee743fa781ca3f470f97ed76d1501f7222
2010-09-10 15:01:35 -04:00
Adam Powell
bc234a19f4 Clean up action bar styles
Change-Id: Ib19698e08d643994c4416aac29a43e9197bbe1f3
2010-09-10 11:51:10 -07:00
Scott Main
51c18989cf docs: update platform dashboard
Change-Id: Id4acf3ca425b278e534f83511fb10dfdbdceb03b
2010-09-10 11:46:17 -07:00
Wink Saville
ad8f2191d8 Merge "Fix bug 2972138 Lost cell data connection and didn't get it back." 2010-09-10 11:36:53 -07:00
James Dong
c18c02d78c am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a'

* commit '2432248b03c675812dbb2154e2535bf3ada54b0a':
  Fixed a copy and paste error
2010-09-10 11:34:15 -07:00
Wink Saville
8d8fce8821 am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread
Merge commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2' into gingerbread-plus-aosp

* commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2':
  Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
2010-09-10 11:32:36 -07:00
Eric Laurent
dd88d7e3ff am ea4680f0: am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread
Merge commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981'

* commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981':
  LVM release 1.09 delivery
2010-09-10 11:30:16 -07:00
Wink Saville
9a3ce10c6c Merge "Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE." into gingerbread 2010-09-10 11:30:15 -07:00
Erik
5729ce27a9 am a388a324: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp
Merge commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946'

* commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946':
2010-09-10 11:30:00 -07:00
Robert Greenwalt
8a300c6107 am d4e722b7: am 34763928: Merge "add ART for inet connection condition" into gingerbread
Merge commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004'

* commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004':
  add ART for inet connection condition
2010-09-10 11:29:54 -07:00
Jean-Baptiste Queru
3d6b009db1 am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373'

* commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373':
  Initial contribution from Sony Corporation.
2010-09-10 11:29:10 -07:00
James Dong
2432248b03 am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp

* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
  Fixed a copy and paste error
2010-09-10 11:25:24 -07:00