788 Commits

Author SHA1 Message Date
The Android Open Source Project
3d73eeb7b3 am 8705a41: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'

* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
  * update density correctly when the configuration is changed.
2009-05-08 07:22:44 -07:00
The Android Open Source Project
1471c8f6a7 am c664d18: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e'

* commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e':
  don't use modulo
2009-05-08 07:22:44 -07:00
The Android Open Source Project
c11dbe782d am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'

* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
  Fix automatically generated code for glGet
2009-05-08 07:22:41 -07:00
The Android Open Source Project
1a36071092 manual merge of 7ec32cc
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
Android (Google) Code Review
881c4c25f1 Merge change 1108 into donut
* changes:
  * update density correctly when the configuration is changed. * Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-07 17:39:57 -07:00
Android (Google) Code Review
07d7521376 Merge change 760 into donut
* changes:
  don't use modulo
2009-05-07 17:23:51 -07:00
Mitsuru Oshima
d4cc32ca99 don't use modulo 2009-05-07 17:02:27 -07:00
Android (Google) Code Review
2108e5c74f Merge change 1163 into donut
* changes:
  Fix automatically generated code for glGet
2009-05-07 17:01:13 -07:00
Joe Onorato
b1a7ffef3a More backup tests 2009-05-07 15:32:48 -07:00
Brandon Ballinger
e1a085801d am fedf566: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'fedf566b9e00f18588fc104caafd047af069844a'

* commit 'fedf566b9e00f18588fc104caafd047af069844a':
  AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
2009-05-07 14:30:13 -07:00
Brandon Ballinger
fedf566b9e Merge branch 'readonly-p4-donut' into donut 2009-05-07 14:26:17 -07:00
Brandon Ballinger
cdd0ac6d85 AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
(2) Return error strings to client rather than error types.

Automated import of CL 148484
2009-05-07 14:24:02 -07:00
Jack Palevich
be509c9c7d Fix automatically generated code for glGet
Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
2009-05-07 10:52:18 -07:00
Android (Google) Code Review
5bd1d84aa8 am 90da134: Merge change 1065 into donut
Merge commit '90da134befec804852775be7fd4905a1a188ff00'

* commit '90da134befec804852775be7fd4905a1a188ff00':
  Add a contact placeholder picture.
2009-05-07 01:07:37 -07:00
Android (Google) Code Review
90da134bef Merge change 1065 into donut
* changes:
  Add a contact placeholder picture.
2009-05-07 01:05:41 -07:00
The Android Open Source Project
cfe5cdd3a1 manual merge d90a331 to avoid conflicts
Merge commit 'd90a331'
2009-05-06 18:16:52 -07:00
Android (Google) Code Review
8dd6de8050 Merge change 1109
* changes:
  Another fix: look at db version to determine if there is a type column.
2009-05-06 17:21:57 -07:00
Romain Guy
d90a33111b Add new setTag(int, Object) API to allow applications to specify several tags. 2009-05-06 16:49:56 -07:00
Mitsuru Oshima
2e3d3b9ce7 * update density correctly when the configuration is changed.
* Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-06 16:42:11 -07:00
Android (Google) Code Review
77066048f4 am 413cf5f: Merge change 1110 into donut
Merge commit '413cf5f4536b9c029d07f99b1c769c026313cd12'

* commit '413cf5f4536b9c029d07f99b1c769c026313cd12':
  Track install/removal/update of packages that provide backup services
2009-05-06 16:18:45 -07:00
Android (Google) Code Review
413cf5f453 Merge change 1110 into donut
* changes:
  Track install/removal/update of packages that provide backup services
2009-05-06 16:15:21 -07:00
Christopher Tate
3799bc241b Track install/removal/update of packages that provide backup services 2009-05-06 16:13:56 -07:00
Android (Google) Code Review
34f97460bd am f2331a6: Merge change 1063 into donut
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'

* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
  Refactor SearchableInfo.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
6ea036760f am f759824: Merge change 1086 into donut
Merge commit 'f7598245489c6d28c2673acd269ada2e6e834065'

* commit 'f7598245489c6d28c2673acd269ada2e6e834065':
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 15:49:00 -07:00
Christopher Tate
959a4bcc46 am b1d790b: Pass null as savedState to indicate a full backup is require
Merge commit 'b1d790b63e2115be558d451efbc914d1f8dfa846'

* commit 'b1d790b63e2115be558d451efbc914d1f8dfa846':
  Pass null as savedState to indicate a full backup is required
2009-05-06 15:49:00 -07:00
Android (Google) Code Review
37dbf09917 am 9a6f250: Merge change 1089 into donut
Merge commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c'

* commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c':
  Add a Backup Manager interface to request a full backup
2009-05-06 15:48:59 -07:00
Dianne Hackborn
2d5ed1fa3d Another fix: look at db version to determine if there is a type column. 2009-05-06 15:22:38 -07:00
Android (Google) Code Review
f2331a63c0 Merge change 1063 into donut
* changes:
  Refactor SearchableInfo.
2009-05-06 14:20:53 -07:00
Android (Google) Code Review
f759824548 Merge change 1086 into donut
* changes:
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 12:45:16 -07:00
Christopher Tate
b1d790b63e Pass null as savedState to indicate a full backup is required 2009-05-06 12:38:21 -07:00
Christopher Tate
4675812386 Add a Backup Manager interface to request a full backup
Given a package name, the Backup Manager schedules a *full* (i.e. non-
incremental) backup pass for that package.  Also added the state-file
handling for distinguishing to the target between the full and incremental
backup requests.
2009-05-06 11:24:27 -07:00
Romain Guy
e5b7632e5b Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map. 2009-05-06 11:12:38 -07:00
Dianne Hackborn
534032610c Fix [Issue 1835218]
IllegalStateException already initialized in SyncStorageEngine.init
I used the wrong column name for the new account type.
2009-05-06 10:53:37 -07:00
yes
697805d02a Add a contact placeholder picture.
Previously, there was no generic contact icon in the framework.
ContactsProvider needs to have a generic contact icon to use
for contacts that don't have photos. Since there are multiple
packages (MyFaves, GoogleSubscribedFeedsProvider) that use
ContactsProvider.java directly, adding the icon in the
ContactsProvider package is not an option.

The icon is a copy of
packages/apps/Contacts/res/drawable-finger/ic_contact_picture.png
2009-05-06 14:35:48 +01:00
Bjorn Bringert
a92041306e Refactor SearchableInfo.
- Removes the mSearchable field which was only
  for communication between the constructor and
  getActivityMetaData().
- Removes the badge and query rewriting fields,
  since their values can be efficiently computed
  on the fly.
- Makes all the other public fields private and adds getters
  for them.
- Makes all fields final, except mActionKeys.
- Removes the DBG_INHIBIT_SUGGESTIONS_CONSTANT.
  I don't see why we would every want that, and it
  complicated making the fields final.
- Makes all fields in ActionKeyInfo final.
- Makes all fields in ActionKeyInfo private and adds getters.
- Removes the use of ActioKeyInfo.mKeyCode for failure
  signalling. Uses IllegalArgumentException instead.
- Replaces the ad hoc linked list for looking up
  action keys by a HashMap. This is needed to
  make the fields in ActionkeyInfo final, and also avoids O(N)
  lookup in the (unlikely) case that an activity
  has lots of action keys.
- Don't throw exceptions when reading searchable
  meta-data, since that could crash SearchManagerService.
- Adds debug logging.
2009-05-06 13:54:42 +01:00
Mihai Preda
b6af533114 Allow ViewStub to be used in AdapterView.setEmptyView() (bug 1803058) 2009-05-06 11:48:11 +02:00
Android (Google) Code Review
0f2200ec68 am be3ac2d: Merge change 1040 into donut
Merge commit 'be3ac2d5ba8ef93c3cbf4d05edaf3434a14df2c9'

* commit 'be3ac2d5ba8ef93c3cbf4d05edaf3434a14df2c9':
  Add a test app for the backup
2009-05-06 01:31:32 -07:00
Dianne Hackborn
7a13559501 merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581 2009-05-06 00:28:37 -07:00
Android (Google) Code Review
be3ac2d5ba Merge change 1040 into donut
* changes:
  Add a test app for the backup
2009-05-05 18:58:05 -07:00
Joe Onorato
f9225f89aa Add a test app for the backup 2009-05-05 18:34:31 -07:00
Dianne Hackborn
231cc608d0 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.

There are now 4 files associated with this class, holding various pieces of its state that
should be consistent.  These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time.  Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.

Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database.  This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it.  Other changes in other projects are required to update to the
new API.

The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
2009-05-05 15:40:53 -07:00
Christopher Tate
3cbab32afe am 22b8787: Squashed commit of the following:
Merge commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425'

* commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425':
  Squashed commit of the following:
2009-05-05 10:51:45 -07:00
Christopher Tate
22b8787ed4 Squashed commit of the following:
Author: Christopher Tate <ctate@google.com>
Date:   Mon May 4 16:38:11 2009 -0700

    IBackupService now passes ParcelFileDescriptors rather than int fds

    The outlines of backup state file / data file handling are now in place as well
    in the BackupManagerService.

Author: Christopher Tate <ctate@google.com>
Date:   Thu Apr 30 12:40:19 2009 -0700

    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-05-04 20:19:21 -07:00
Android (Google) Code Review
2d23cbfc0d am 6362741: Merge change 966 into donut
Merge commit '636274185ed5ee75faf6ef4d84bbb7d5b0371248'

* commit '636274185ed5ee75faf6ef4d84bbb7d5b0371248':
  Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
2009-05-04 17:57:06 -07:00
Android (Google) Code Review
636274185e Merge change 966 into donut
* changes:
  Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
2009-05-04 17:54:39 -07:00
Romain Guy
20fb46fa1e Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately. 2009-05-04 17:45:59 -07:00
Android (Google) Code Review
4b72c1eb9f am b7ce28c: Merge change 962 into donut
Merge commit 'b7ce28c64cc2f7250b02021f8a4cd3874155bee8'

* commit 'b7ce28c64cc2f7250b02021f8a4cd3874155bee8':
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.
2009-05-04 17:00:13 -07:00
Android (Google) Code Review
b7ce28c64c Merge change 962 into donut
* changes:
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.
2009-05-04 16:59:12 -07:00
Romain Guy
51d154b82b Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events. 2009-05-04 16:24:39 -07:00
Android (Google) Code Review
d52d8dee77 am 2c9eec6: Merge change 952 into donut
Merge commit '2c9eec6b1d072a665b17dd4285260aa4d4fadcf4'

* commit '2c9eec6b1d072a665b17dd4285260aa4d4fadcf4':
  Debug: Minor cleanup
2009-05-04 16:22:33 -07:00