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

Commit 29147e5f 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 f0cdb83d 265d3c2a

src/com/android/settings/AirplaneModeEnabler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import android.provider.Settings;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.PhoneStateIntentReceiver;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.settings.core.instrumentation.MetricsFeatureProvider;

src/com/android/settings/ApnEditor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ import android.view.MenuItem;
		import android.view.View;
		import android.view.View.OnKeyListener;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.util.ArrayUtils;

src/com/android/settings/ApnSettings.java

+1 −1

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

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.dataconnection.ApnSetting;

src/com/android/settings/ApplicationSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.support.v7.preference.ListPreference;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.Preference.OnPreferenceChangeListener;

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

		public class ApplicationSettings extends SettingsPreferenceFragment {

src/com/android/settings/BugreportPreference.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.view.View;
		import android.widget.CheckedTextView;
		import android.widget.TextView;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.overlay.FeatureFactory;

		public class BugreportPreference extends CustomDialogPreference {