Merge "Fix robolectric test failure in settings"

import android.content.res.XmlResourceParser;

import android.icu.text.TimeZoneFormat;

import android.icu.text.TimeZoneNames;

import android.support.annotation.VisibleForTesting;

import android.support.v4.text.BidiFormatter;

import android.support.v4.text.TextDirectionHeuristicsCompat;

import android.text.SpannableString;

import com.android.settingslib.R;

import libcore.util.TimeZoneFinder;

import org.xmlpull.v1.XmlPullParserException;

import java.util.ArrayList;

import java.util.Map;

import java.util.Set;

import java.util.TimeZone;

import libcore.util.TimeZoneFinder;

/**

 * ZoneGetter is the utility class to get time zone and zone list, and both of them have display

        return gmtText;

    }

    private static final class ZoneGetterData {

    @VisibleForTesting

    public static final class ZoneGetterData {

        public final String[] olsonIdsToDisplay;

        public final CharSequence[] gmtOffsetTexts;

        public final TimeZone[] timeZones;

            }

            // Create a lookup of local zone IDs.

            List<String> zoneIds =

                    TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(locale.getCountry());

            final List<String> zoneIds = lookupTimeZoneIdsByCountry(locale.getCountry());

            localZoneIds = new HashSet<>(zoneIds);

        }

        @VisibleForTesting

        public List<String> lookupTimeZoneIdsByCountry(String country) {

            return TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(country);

        }

    }

}