1431 Commits

Author SHA1 Message Date
Mathias Agopian
dff8e58d47 update surfaceflinger, libui and libagl to the new gralloc api
- Currently the lock/unlock path is naive and is done for each drawing operation (glDrawElements and glDrawArrays). this should be improved eventually.
- factor all the lock/unlock code in SurfaceBuffer.
- fixed "showupdate" so it works even when we don't have preserving eglSwapBuffers().
- improved the situation with the dirty-region and fixed a problem that caused GL apps to not update.
- make use of LightRefBase() where needed, instead of duplicating its implementation
- add LightRefBase::getStrongCount()
- renamed EGLNativeWindowSurface.cpp to FramebufferNativeWindow.cpp

- disabled copybits test, since it clashes with the new gralloc api

- Camera/Video will be fixed later when we rework the overlay apis
2009-05-04 14:17:04 -07:00
Mathias Agopian
fa6eda01a9 Merge commit 'goog/master' into merge_master
Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen
2009-04-30 14:43:18 -07:00
Android (Google) Code Review
072868a4d3 am 3674252: Merge change 817 into donut
Merge commit '36742528f89fd13e65c8652cc684cffc9e97b567'

* commit '36742528f89fd13e65c8652cc684cffc9e97b567':
  Hide the backup stuff for now
2009-04-30 13:14:48 -07:00
Android (Google) Code Review
36742528f8 Merge change 817 into donut
* changes:
  Hide the backup stuff for now
2009-04-30 12:43:33 -07:00
Christopher Tate
c114eb55b4 Hide the backup stuff for now
Also adjust based on comments:
+ changed service intent string to conform to usage guidelines
+ only publish the IBackupService binder when invoked with the right
  intent action
+ docs tweaks
2009-04-30 12:40:19 -07:00
Mike Lockwood
245eb108d5 am c21a08f: gps: Fix missing return value in android_location_GpsLocatio
Merge commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0'

* commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0':
  gps: Fix missing return value in android_location_GpsLocationProvider_init
2009-04-30 12:34:13 -07:00
Android (Google) Code Review
171134a0e2 am 021dce4: Merge change 811 into donut
Merge commit '021dce4198afbf602109ba5807a193c437b05361'

* commit '021dce4198afbf602109ba5807a193c437b05361':
  Add android.backup.BackupManager
2009-04-30 12:34:10 -07:00
Mike Lockwood
c21a08f747 gps: Fix missing return value in android_location_GpsLocationProvider_init
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-30 15:17:49 -04:00
Android (Google) Code Review
021dce4198 Merge change 811 into donut
* changes:
  Add android.backup.BackupManager
2009-04-30 11:38:54 -07:00
Christopher Tate
a8bf815c61 Add android.backup.BackupManager
Also tweak the dataChanged() api to have the client supply a package name.  We
don't necessarily TRUST this, but we use it to narrow the set of packages requesting
a backup pass, no longer blithely scheduling a pass for all packages associated
with the caller's uid.
2009-04-30 11:36:21 -07:00
Android (Google) Code Review
60c8b8e48b am a039d46: Merge change 792 into donut
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'

* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
  Allow access to global search by pressing the hard search button again
2009-04-30 11:00:07 -07:00
Android (Google) Code Review
a039d465a8 Merge change 792 into donut
* changes:
  Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
2009-04-30 10:07:39 -07:00
Mike LeBeau
b3aab69581 Allow access to global search by pressing the hard search button again
within in-app search. If within in-app search and toggled out to global
search, pressing the hard search button will take the user *back* into
in-app search too.
2009-04-30 09:45:53 -07:00
Ben Murdoch
7df1985e86 Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the browser. 2009-04-30 13:46:01 +01:00
android-build SharedAccount
4ed7c18f91 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-04-30 00:26:40 -07:00
android-build SharedAccount
d2d9cd0a9b fix the build 2009-04-30 00:25:53 -07:00
Dan Bornstein
e080b55eab am 5fcfcd0: am b4c218e: AI 147994: First cut of CharsetUtils, a utility
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'

* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
  AI 147994: First cut of CharsetUtils, a utility class that aims to
2009-04-30 00:02:27 -07:00
Dan Bornstein
5fcfcd0f34 am b4c218e: AI 147994: First cut of CharsetUtils, a utility class that a
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut

* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
  AI 147994: First cut of CharsetUtils, a utility class that aims to
2009-04-29 23:31:38 -07:00
Mitsuru Oshima
453a34f62b am d4ed049: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'

* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
  AI 148024: fix NPE when there is no history
2009-04-29 23:20:11 -07:00
android-build SharedAccount
bb15b1cb33 fixed two stray merge issues 2009-04-29 19:48:59 -07:00
Mitsuru Oshima
d4ed049672 Merge branch 'readonly-p4-donut' into donut 2009-04-29 17:15:14 -07:00
Mitsuru Oshima
dffbb4dbce AI 148024: fix NPE when there is no history
Automated import of CL 148024
2009-04-29 17:13:46 -07:00
Android (Google) Code Review
c2bc16cd5a am 7fe3b06: Merge change 740 into donut
Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2'

* commit '7fe3b064d3645fcebd09b162c5989e0d702112e2':
  MIDI render thread was nice 0, should be nice -16.
2009-04-29 15:43:34 -07:00
Android (Google) Code Review
7fe3b064d3 Merge change 740 into donut
* changes:
  MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
2009-04-29 15:27:15 -07:00
Christopher Tate
f8997690da am 487529a: First baby steps towards settings backup
Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185'

* commit '487529a70cd1479ae8d6bbfb356be7e72542c185':
  First baby steps towards settings backup
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
55a664f87b am dc67739: Merge change 741 into donut
Merge commit 'dc67739af90aa31a0b546c14bf1e68e6acbb8375'

* commit 'dc67739af90aa31a0b546c14bf1e68e6acbb8375':
  Fix typo in searchSuggestThreshold attr doc.
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
b0d8abd591 am 73b7184: Merge change 748 into donut
Merge commit '73b71842dc9c943d69ce28212776ce671e54bcdb'

* commit '73b71842dc9c943d69ce28212776ce671e54bcdb':
  Fix the build.
2009-04-29 15:16:52 -07:00
The Android Open Source Project
8585e19ed4 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-04-29 15:16:52 -07:00
Christopher Tate
487529a70c First baby steps towards settings backup
This change adds a sketched outline of the backup system architecture, with
all of the major pieces represented other than client-side helpers for
specific types of data.  IBackupManager and BackupService are public so that
we can write test apps against SDK-domain symbols from the outset.

What code exists in this change hasn't been tested and may crash.  It's the
beginnings of the real implementation but of course is barely begun.
2009-04-29 14:49:30 -07:00
Android (Google) Code Review
b7a64360fa Merge change 711
* changes:
  store contact id in messages table instead of contact name string; merge messages and group messages tables.
2009-04-29 14:32:10 -07:00
Android (Google) Code Review
dc67739af9 Merge change 741 into donut
* changes:
  Fix typo in searchSuggestThreshold attr doc.
2009-04-29 14:30:27 -07:00
Android (Google) Code Review
73b71842dc Merge change 748 into donut
* changes:
  Fix the build.
2009-04-29 13:51:33 -07:00
Romain Guy
2a4bf5cee3 Fix the build. 2009-04-29 13:50:54 -07:00
Android (Google) Code Review
090d32b275 am 9ae8873: Merge change 617 into donut
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'

* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
  Allow caller-supplied column aliases in queries even when a projection map is used.
2009-04-29 13:41:23 -07:00
Android (Google) Code Review
ef77be9526 am 9f98f79: Merge change 739 into donut
Merge commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a'

* commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a':
  Vorbis render thread was nice 0, should be nice -16.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
0f9206e01b am 649b1c6: Merge change 736 into donut
Merge commit '649b1c6ec317b6dd61a385df911e7fe543c5871a'

* commit '649b1c6ec317b6dd61a385df911e7fe543c5871a':
  CheckedTextView is abstract but can be inflated from XML. Let's be consistent and allow it to be used from Java code as well by making it non-abstract.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
e4ddb19acb am efae672: Merge change 725 into donut
Merge commit 'efae672d7303fb6682b2ae8704a62146297a0a5a'

* commit 'efae672d7303fb6682b2ae8704a62146297a0a5a':
  Add 'includeInGlobalSearch' attribute to searchable meta-data.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
cb6c7248ba am 05e4755: Merge change 724 into donut
Merge commit '05e47550bb5bcd7cff10b03c8da31e5b55ee4c91'

* commit '05e47550bb5bcd7cff10b03c8da31e5b55ee4c91':
  Split testSearchablesMocked into two tests.
2009-04-29 13:41:21 -07:00
Bjorn Bringert
6b8da4e1aa am c1f4096: Remove menu from SearchDialog.
Merge commit 'c1f40960644b461b108480b6446c89963441492d'

* commit 'c1f40960644b461b108480b6446c89963441492d':
  Remove menu from SearchDialog.
2009-04-29 13:41:21 -07:00
Android (Google) Code Review
58412a4724 am 80f3b97: Merge change 730 into donut
Merge commit '80f3b97121477e9ed62193c038772b4d020534df'

* commit '80f3b97121477e9ed62193c038772b4d020534df':
  New font that fixes the accent shape/orientation on 1EDD
2009-04-29 13:41:21 -07:00
Android (Google) Code Review
bcefcb5e95 am c5f1b92: Merge change 691 into donut
Merge commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3'

* commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3':
  Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.
2009-04-29 13:41:21 -07:00
The Android Open Source Project
bff1389c9a fix conflict markers 2009-04-29 13:41:02 -07:00
The Android Open Source Project
c6e3de9e09 am 203464a: Add searchSuggestThreshold to searchable meta-data. 2009-04-29 13:40:03 -07:00
Android (Google) Code Review
adf431b54a am 493b00a: Merge change 640 into donut
Merge commit '493b00afbfd4f603939ee98540a4d8df084107fd'

* commit '493b00afbfd4f603939ee98540a4d8df084107fd':
  Add GLOBAL_SEARCH intent for finding global search provider.
2009-04-29 13:35:48 -07:00
Eric Fischer
4c4c51b78e am 7ffeac8: am a21e376: AI 147962: Import updated zh_TW translations.
Merge commit '7ffeac8db927c0179a9d24d20dbbb49087e604cc'

* commit '7ffeac8db927c0179a9d24d20dbbb49087e604cc':
  AI 147962: Import updated zh_TW translations.
2009-04-29 13:35:48 -07:00
Scott Main
eff18de604 am c13fe2c: am c804836: AI 147951: delete unused files
Merge commit 'c13fe2c00b05dfdf3b5ee220ab0327358ed04081'

* commit 'c13fe2c00b05dfdf3b5ee220ab0327358ed04081':
  AI 147951: delete unused files
2009-04-29 13:35:47 -07:00
Scott Main
c9a847a4b1 am b2b841d: am 998234e: AI 147947: update the sitemap. add disallow in r
Merge commit 'b2b841db08057a6dbc86f99fd35106ed741da126'

* commit 'b2b841db08057a6dbc86f99fd35106ed741da126':
  AI 147947: update the sitemap. add disallow in robots file for the sdk/preview/
2009-04-29 13:35:47 -07:00
Dirk Dougherty
f7af2c5b7f am 0b8c4fa: am 752aaf9: AI 147874: Fix format and link errors in docs.
Merge commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624'

* commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624':
  AI 147874: Fix format and link errors in docs.
2009-04-29 13:35:47 -07:00
Scott Main
5a2390d491 am 9eb6ac8: am 5fe696f: AI 147814: tweaks to the hello world tutorial.
Merge commit '9eb6ac878e47ba5340896cab10ac17e269b518d1'

* commit '9eb6ac878e47ba5340896cab10ac17e269b518d1':
  AI 147814: tweaks to the hello world tutorial.
2009-04-29 13:35:46 -07:00
Scott Main
e485fa5192 am 563dc08: am 2222c9e: AI 147812: close <em> tag
Merge commit '563dc08ec0d80d60926ec27385733bfe4c8c5ee2'

* commit '563dc08ec0d80d60926ec27385733bfe4c8c5ee2':
  AI 147812: close <em> tag
2009-04-29 13:35:46 -07:00