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

Commit 4012a31c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "settings_westworld" 

* changes:
  Reset allow background activity to default on
  Migrate all MetricsProto enums to SettingsEnums
parents 7c7e0d4d fb904299

src/com/android/settings/AirplaneModeEnabler.java

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.database.ContentObserver;
@@ -26,7 +27,6 @@ import android.os.SystemProperties; 
import android.os.UserHandle;

import android.provider.Settings;



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

import com.android.internal.telephony.PhoneStateIntentReceiver;

import com.android.internal.telephony.TelephonyProperties;

import com.android.settingslib.WirelessUtils;
@@ -129,7 +129,7 @@ public class AirplaneModeEnabler { 
                SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {

            // In ECM mode, do not update database at this point

        } else {

            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE,

            mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AIRPLANE_TOGGLE,

                    isAirplaneModeOn);

            setAirplaneModeOn(isAirplaneModeOn);

        }

src/com/android/settings/BandMode.java

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import android.os.Message; 
import android.util.Log;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.AdapterView;

import android.widget.ArrayAdapter;

import android.widget.ListView;

src/com/android/settings/BugreportPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import android.app.ActivityManager;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.DialogInterface;

import android.os.RemoteException;
@@ -28,7 +29,6 @@ import android.widget.TextView; 


import androidx.appcompat.app.AlertDialog.Builder;



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

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.CustomDialogPreferenceCompat;
@@ -85,12 +85,12 @@ public class BugreportPreference extends CustomDialogPreferenceCompat { 
            if (mFullTitle.isChecked()) {

                Log.v(TAG, "Taking full bugreport right away");

                FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,

                        MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL);

                        SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_FULL);

                takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL);

            } else {

                Log.v(TAG, "Taking interactive bugreport right away");

                FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,

                        MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);

                        SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);

                takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);

            }

        }

src/com/android/settings/CryptKeeperConfirm.java

+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
import android.annotation.Nullable;

import android.app.Activity;

import android.app.StatusBarManager;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;
@@ -34,7 +35,6 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.Button;



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

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.core.InstrumentedFragment;
@@ -46,7 +46,7 @@ public class CryptKeeperConfirm extends InstrumentedFragment { 


    @Override

    public int getMetricsCategory() {

        return MetricsEvent.CRYPT_KEEPER_CONFIRM;

        return SettingsEnums.CRYPT_KEEPER_CONFIRM;

    }



    public static class Blank extends Activity {

src/com/android/settings/CustomListPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;
@@ -30,7 +31,6 @@ import androidx.fragment.app.FragmentTransaction; 
import androidx.preference.ListPreference;

import androidx.preference.ListPreferenceDialogFragmentCompat;



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

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;



public class CustomListPreference extends ListPreference {
@@ -221,7 +221,7 @@ public class CustomListPreference extends ListPreference { 


        @Override

        public int getMetricsCategory() {

            return MetricsProto.MetricsEvent.DIALOG_CUSTOM_LIST_CONFIRMATION;

            return SettingsEnums.DIALOG_CUSTOM_LIST_CONFIRMATION;

        }

    }

}