Merge change I20d77880 into eclair-mr2
* changes:
Make Gservices setting constants public.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e826db9..ec0fe38 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3588,39 +3588,39 @@
/**
* 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";
/**
* 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";
/**
* The maximum number of simultaneous changes to allow before alerting the user for
* 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";
/**
* The maximum percentage of simultaneous changes to allow before alerting the user for
* 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";
/**
* 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";
/**
* 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";
/**