Commit Graph

506 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Scott Main
3813fdaa8f am 8419fcd: am b8b3645: AI 147803: add docs and images for docs on Toast
Merge commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4'

* commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4':
  AI 147803: add docs and images for docs on Toast and  Notification docs
2009-04-29 13:35:44 -07:00
Scott Main
08f1edf235 am 073bc61: am 8a4c53a: AI 147732: fix broken links
Merge commit '073bc611ce22e798e90559689aaf771df4a8bf4c'

* commit '073bc611ce22e798e90559689aaf771df4a8bf4c':
  AI 147732: fix broken links
2009-04-29 13:35:41 -07:00
Scott Main
64b786f159 am af3289e: am 620986a: AI 147438: add app widget docs to dev guide
Merge commit 'af3289e4448971b38ae4e95269401452dbc6077e'

* commit 'af3289e4448971b38ae4e95269401452dbc6077e':
  AI 147438: add app widget docs to dev guide
2009-04-29 13:35:39 -07:00
Mitsuru Oshima
c2839e0870 am 13735a2: Merge branch \'readonly-p4-donut\' into donut
Merge commit '13735a255dedd2c2e3b0cff66f0be2e17671f553'

* commit '13735a255dedd2c2e3b0cff66f0be2e17671f553':
  AI 147976: Compatibility mode support. Part 2.
2009-04-29 13:35:38 -07:00
Karl Rosaen
2f7e0447ac am 98e333f: Fix back key and ime behavior for search dialog.
Merge commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b'

* commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b':
  Fix back key and ime behavior for search dialog.
2009-04-29 13:35:36 -07:00
Android (Google) Code Review
36ef99673b am e4de845: Merge change 625 into donut
Merge commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0'

* commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0':
  fix 1812272 SensorManager method returns hidden object
2009-04-29 13:35:35 -07:00
Android (Google) Code Review
d3f78458dd am 6fcddb0: Merge change 629 into donut
Merge commit '6fcddb05eee19edfd3063b9eefbdb0de0dbd4f4f'

* commit '6fcddb05eee19edfd3063b9eefbdb0de0dbd4f4f':
  Display the app icon to the left of the search field for search within apps.
2009-04-29 13:35:35 -07:00
Android (Google) Code Review
a5a51e1724 am 77c9990: Merge change 599 into donut
Merge commit '77c9990ae0806575ae7a2750459f3e74f0bec092'

* commit '77c9990ae0806575ae7a2750459f3e74f0bec092':
  Add call to (new) Canvas.freeCaches() in response to low-memory
2009-04-29 13:35:35 -07:00
Mitsuru Oshima
4cc574be4e am 257eef3: Merge branch \'readonly-p4-donut\' into donut
Merge commit '257eef353dfc9519b63e3fe2616505c5534b460a'

* commit '257eef353dfc9519b63e3fe2616505c5534b460a':
  AI 147845: Compatibility mode support. Part 1
2009-04-29 13:35:29 -07:00
Android (Google) Code Review
d1d2af6846 am 3eab744: Merge change 376 into donut
Merge commit '3eab744d018924189b1b8f5530accd52e91213de'

* commit '3eab744d018924189b1b8f5530accd52e91213de':
  Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
2009-04-29 13:35:29 -07:00
Bjorn Bringert
8b65d2c358 am 7fc4b28: Merge branch \'readonly-p4-donut\' into donut
Merge commit '7fc4b281750be2442a327e7aa9fb03c44096caf3'

* commit '7fc4b281750be2442a327e7aa9fb03c44096caf3':
  AI 147681: Fix SearchDialog crash on missing FORMAT suggestion column.
2009-04-29 13:35:23 -07:00
The Android Open Source Project
8f080ec429 am f3ccf8a: Merge branch \'readonly-p4-donut\' into donut 2009-04-29 13:34:51 -07:00
Android (Google) Code Review
9ae8873ed8 Merge change 617 into donut
* changes:
  Allow caller-supplied column aliases in queries even when a projection map is used.
2009-04-29 13:31:13 -07:00
Android (Google) Code Review
f8e258ee1b am 5616a7d: Merge change 459 into donut
Merge commit '5616a7d1dea1aecc8353bab144d14446aa33391a'

* commit '5616a7d1dea1aecc8353bab144d14446aa33391a':
  TypedProperties: initial commit
2009-04-29 13:11:33 -07:00
Android (Google) Code Review
137b0c9d64 am 0b8ffd1: Merge change 460 into donut
Merge commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82'

* commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82':
  More optimization of dumpsys output.
2009-04-29 13:11:27 -07:00
Android (Google) Code Review
649b1c6ec3 Merge change 736 into donut
* changes:
  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:06:31 -07:00
Android (Google) Code Review
efae672d73 Merge change 725 into donut
* changes:
  Add 'includeInGlobalSearch' attribute to searchable meta-data.
2009-04-29 13:03:47 -07:00
Bjorn Bringert
c1f4096064 Remove menu from SearchDialog.
Before, pressing MENU with the SearchDialog open would show
a menu item that launched the search settings activity. Now that
the search settings are accessible from the Settings app, this is
no longer needed.

Fixes http://b/issue?id=1819469 and http://b/issue?id=1817823
2009-04-29 20:49:56 +01:00
Bjorn Bringert
6d72e029cb Add 'includeInGlobalSearch' attribute to searchable meta-data.
The attribute is not yet public.
Also adds a SearchManager method for listing all
searchables that can be included in global search.
This is the framework part of http://b/issue?id=1819651
2009-04-29 20:23:04 +01:00
Romain Guy
8b5e7c046d 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 11:48:22 -07:00
Wei Huang
b3624b9680 store contact id in messages table instead of contact name string; merge messages and group messages tables.
- removed GroupMessages API, groupchat messages are merged with messages. So where we used to have
  GroupMessages.CONTENT_URI, now we have Messages.GROUP_MESSAGES_CONTENT_URI. Messages api now has a flag
  IS_GROUP_CHAT to indicate that a message is a groupchat message.
- instead of storing 'provider', 'account', 'contact' in the messages table, store a 'thread_id' column instead.
  thread_id is really just the contact_id for both messages and groupchat messages.
- add getContentUriByThreadId() api, for now, retained the old getContentUriByContact(), but it's deprecated.
2009-04-29 11:46:21 -07:00
Patrick Scott
e82dc42052 Parse the base64 data before creating the data stream.
This will ensure that we do not parse the data in chunks when passing it to the
LoadListener. Decoding in chunks can lead to incomplete sequences which will
lead to a failed decode.

Check for a cancelled LoadListener in StreamLoader and stop the load. This is
just a shortcut for downloaded or failed resources.

Cleanup some of the LoadListener code around resetting a few member variables.
Reset them in the status callback since that indicates a new response from the
server (or StreamLoader).
2009-04-29 14:11:27 -04:00