Merge "instrument fingerprint settings" into mnc-dr-dev (15ff8af7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/InstrumentedActivity.java

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings;

		import com.android.internal.logging.MetricsLogger;

		import android.app.Activity;

		/**
		* Instrumented activity that logs visibility state.
		*/
		public abstract class InstrumentedActivity extends Activity {
		/**
		* Declare the view of this category.
		*
		* Categories are defined in {@link com.android.internal.logging.MetricsLogger}
		* or if there is no relevant existing category you may define one in
		* {@link com.android.settings.InstrumentedFragment}.
		*/
		protected abstract int getMetricsCategory();

		@Override
		public void onResume() {
		super.onResume();
		MetricsLogger.visible(this, getMetricsCategory());
		}

		@Override
		public void onPause() {
		super.onPause();
		MetricsLogger.hidden(this, getMetricsCategory());
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.widget.Button;
		import android.widget.TextView;

		import com.android.settings.ChooseLockSettingsHelper;
		import com.android.settings.InstrumentedActivity;
		import com.android.settings.R;
		import com.android.setupwizardlib.SetupWizardLayout;
		import com.android.setupwizardlib.view.NavigationBar;
		@@ -35,7 +36,8 @@ import com.android.setupwizardlib.view.NavigationBar;
		/**
		* Base activity for all fingerprint enrollment steps.
		*/
		public class FingerprintEnrollBase extends Activity implements View.OnClickListener {
		public abstract class FingerprintEnrollBase extends InstrumentedActivity
		implements View.OnClickListener {

		/**
		* Used by the choose fingerprint wizard to indicate the wizard is

+6 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.widget.ImageView;
		import android.widget.ProgressBar;
		import android.widget.TextView;

		import com.android.internal.logging.MetricsLogger;
		import com.android.settings.ChooseLockSettingsHelper;
		import com.android.settings.R;

		@@ -380,6 +381,11 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
		}
		};

		@Override
		protected int getMetricsCategory() {
		return MetricsLogger.FINGERPRINT_ENROLLING;
		}

		public static class IconTouchDialog extends DialogFragment {

		@Override

+6 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Intent;
		import android.hardware.fingerprint.FingerprintManager;
		import android.os.Bundle;

		import com.android.internal.logging.MetricsLogger;
		import com.android.settings.ChooseLockSettingsHelper;
		import com.android.settings.R;

		@@ -105,4 +106,9 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
		finish();
		}
		}

		@Override
		protected int getMetricsCategory() {
		return MetricsLogger.FINGERPRINT_FIND_SENSOR;
		}
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.preference.Preference;
		import android.view.View;
		import android.widget.Button;

		import com.android.internal.logging.MetricsLogger;
		import com.android.settings.R;
		import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;

		@@ -70,4 +71,9 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase {
		}
		super.onClick(v);
		}

		@Override
		protected int getMetricsCategory() {
		return MetricsLogger.FINGERPRINT_ENROLL_FINISH;
		}
		}