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

Commit 67387af7 authored Nov 09, 2016 by Tamas Berghammer Committed by Android (Google) Code Review Nov 09, 2016

Merge "Update package names to work with the proto3 compiler"

parents 2fb25568 383db5eb

core/java/com/android/internal/app/ChooserActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ import android.widget.ListView;
		import com.android.internal.R;
		import com.android.internal.app.ResolverActivity.TargetInfo;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.google.android.collect.Lists;

		import java.io.File;

core/java/com/android/internal/app/ResolverActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ import android.widget.TextView;
		import android.widget.Toast;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.internal.widget.ResolverDrawerLayout;

		import java.util.ArrayList;

core/java/com/android/internal/logging/MetricsLogger.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ import android.content.Context;
		import android.os.Build;
		import android.view.View;

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

		/**
		* Log all the things.

packages/Keyguard/src/com/android/keyguard/EmergencyButton.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ import android.view.ViewConfiguration;
		import android.widget.Button;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.IccCardConstants.State;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.internal.policy.EmergencyAffordanceManager;

packages/PrintSpooler/src/com/android/printspooler/ui/AddPrinterActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import android.widget.BaseAdapter;
		import android.widget.ImageView;
		import android.widget.TextView;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.printspooler.R;

		import java.text.Collator;