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

Commit 5a638a6a authored by Tamas Berghammer's avatar Tamas Berghammer
Browse files

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" 

This reverts commit fbd5f5fd.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
parent fbd5f5fd

src/com/android/settings/AirplaneModeEnabler.java

+2 −1
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;



import com.android.internal.logging.MetricsLogger;

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

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

import com.android.internal.telephony.PhoneStateIntentReceiver;

import com.android.internal.telephony.TelephonyProperties;

import com.android.settingslib.WirelessUtils;

src/com/android/settings/ApnEditor.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import android.view.MenuItem; 
import android.view.View;

import android.view.View.OnKeyListener;



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

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

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.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.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.nano.MetricsProto.MetricsEvent;

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



public class ApplicationSettings extends SettingsPreferenceFragment {

src/com/android/settings/BugreportPreference.java

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



import com.android.internal.logging.MetricsLogger;

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

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



public class BugreportPreference extends CustomDialogPreference {