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

Commit 13b48736 authored by Victor Chang's avatar Victor Chang Committed by android-build-merger
Browse files

Add tron metric logging am: ab775e1b 

am: c2f0fcd3

Change-Id: Ibfc5af17166d01d3d1db5b93c9ec1e88ece09766
parents 8267c9ab c2f0fcd3

src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java

+0 −6
Original line number Diff line number Diff line
@@ -146,12 +146,6 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment 
        return false;

    }



    @Override

    public int getMetricsCategory() {

        // TODO: use a new metrics id?

        return MetricsEvent.ZONE_PICKER;

    }



    public interface OnListItemClickListener {

        void onListItemClick(int position);

    }

src/com/android/settings/datetime/timezone/FixedOffsetPicker.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.datetime.timezone; 


import android.icu.util.TimeZone;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -42,6 +43,11 @@ public class FixedOffsetPicker extends BaseTimeZoneInfoPicker { 
                R.string.search_settings, false, false);

    }



    @Override

    public int getMetricsCategory() {

        return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_FIXED_OFFSET;

    }



    @Override

    public List<TimeZoneInfo> getAllTimeZoneInfos(TimeZoneData timeZoneData) {

        return loadFixedOffsets();

src/com/android/settings/datetime/timezone/RegionSearchPicker.java

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.icu.text.LocaleDisplayNames; 
import android.os.Bundle;

import android.util.Log;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
@@ -49,6 +50,11 @@ public class RegionSearchPicker extends BaseTimeZonePicker { 
        super(R.string.date_time_select_region, R.string.search_settings, true, true);

    }



    @Override

    public int getMetricsCategory() {

        return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_REGION;

    }



    @Override

    protected BaseTimeZoneAdapter createAdapter(TimeZoneData timeZoneData) {

        mTimeZoneData = timeZoneData;

src/com/android/settings/datetime/timezone/RegionZonePicker.java

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.icu.util.TimeZone; 
import android.support.annotation.VisibleForTesting;

import android.util.Log;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;

import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -46,6 +47,11 @@ public class RegionZonePicker extends BaseTimeZoneInfoPicker { 
        super(R.string.date_time_select_zone, R.string.search_settings, true, false);

    }



    @Override

    public int getMetricsCategory() {

        return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_TIME_ZONE;

    }



    /**

     * Add the extra region id into the result.

     */

tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -119,5 +119,11 @@ public class BaseTimeZoneInfoPickerTest { 
        public Context getContext() {

            return RuntimeEnvironment.application;

        }



        @Override

        public int getMetricsCategory() {

            // the metric id doesn't matter in test

            return 1;

        }

    }

}