Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 208364d3 authored by Ken Shirriff's avatar Ken Shirriff Committed by Android Git Automerger
Browse files

am 4850b5cd: Merge change I20d77880 into eclair-mr2

Merge commit '4850b5cd' into eclair-mr2-plus-aosp

* commit '4850b5cd':
  Make Gservices setting constants public.
parents 0b18c94f 4850b5cd
Loading
Loading
Loading
Loading
+6 −6
Original line number Original line Diff line number Diff line
@@ -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";


        /**
        /**