Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4850b5cd: Merge change I20d77880 into eclair-mr2

Browse Source 
Merge commit '4850b5cd743f4513d59ff41cd6cb548a3a9879d6' into eclair-mr2-plus-aosp

* commit '4850b5cd743f4513d59ff41cd6cb548a3a9879d6':
  Make Gservices setting constants public.
This commit is contained in:
Ken Shirriff
2009-12-03 16:37:27 -08:00
committed by Android Git Automerger
parent 0b18c94f76 4850b5cd74
commit 208364d304
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Settings.java
View File

@@ -3588,39 +3588,39 @@ public final class Settings {
/** /**
* The number of entries to fetch from the feed at a time for calendar sync. * The number of entries to fetch from the feed at a time for calendar sync.
*/ */
private static final String GOOGLE_CALENDAR_SYNC_ENTRY_FETCH_QUEUE_SIZE = public static final String GOOGLE_CALENDAR_SYNC_ENTRY_FETCH_QUEUE_SIZE =
"google_calendar_sync_entry_fetch_queue_size"; "google_calendar_sync_entry_fetch_queue_size";
/** /**
* The number of entities to fetch from the provider at a time for calendar sync. * The number of entities to fetch from the provider at a time for calendar sync.
*/ */
private static final String GOOGLE_CALENDAR_SYNC_ENTITY_FETCH_QUEUE_SIZE = public static final String GOOGLE_CALENDAR_SYNC_ENTITY_FETCH_QUEUE_SIZE =
"google_calendar_sync_entity_fetch_queue_size"; "google_calendar_sync_entity_fetch_queue_size";
/** /**
* The maximum number of simultaneous changes to allow before alerting the user for * The maximum number of simultaneous changes to allow before alerting the user for
* calendar sync. * calendar sync.
*/ */
private static final String GOOGLE_CALENDAR_SYNC_NUM_ALLOWED_SIMULTANEOUS_CHANGES = public static final String GOOGLE_CALENDAR_SYNC_NUM_ALLOWED_SIMULTANEOUS_CHANGES =
"google_calendar_sync_num_allowed_simultaneous changes"; "google_calendar_sync_num_allowed_simultaneous changes";
/** /**
* The maximum percentage of simultaneous changes to allow before alerting the user for * The maximum percentage of simultaneous changes to allow before alerting the user for
* calendar sync. * calendar sync.
*/ */
private static final String GOOGLE_CALENDAR_SYNC_PERCENT_ALLOWED_SIMULTANEOUS_CHANGES = public static final String GOOGLE_CALENDAR_SYNC_PERCENT_ALLOWED_SIMULTANEOUS_CHANGES =
"google_calendar_sync_percent_allowed_simultaneous_changes"; "google_calendar_sync_percent_allowed_simultaneous_changes";
/** /**
* The number of times to apply local changes in calendar sync before stopping. * The number of times to apply local changes in calendar sync before stopping.
*/ */
private static final String GOOGLE_CALENDAR_SYNC_MAX_LOOP_ATTEMPTS = public static final String GOOGLE_CALENDAR_SYNC_MAX_LOOP_ATTEMPTS =
"google_calendar_sync_max_loop_attempts"; "google_calendar_sync_max_loop_attempts";
/** /**
* The batch size for applying server changes to the provider for calendar sync. * The batch size for applying server changes to the provider for calendar sync.
*/ */
private static final String GOOGLE_CALENDAR_SYNC_NUM_APPLICATIONS_PER_BATCH = public static final String GOOGLE_CALENDAR_SYNC_NUM_APPLICATIONS_PER_BATCH =
"google_calendar_sync_num_applications_per_batch"; "google_calendar_sync_num_applications_per_batch";
/** /**