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

Commit da6a4904 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "annoint new constants" into mnc-dev

parents caec03f9 ca689aea

src/com/android/settings/DisplaySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
                @Override

                public boolean onItemSelected(int pos, Object value) {

                    final boolean locked = (Boolean) value;

                    MetricsLogger.action(getActivity(), InstrumentedFragment.ACTION_ROTATION_LOCK,

                    MetricsLogger.action(getActivity(), MetricsLogger.ACTION_ROTATION_LOCK,

                            locked);

                    RotationPolicy.setRotationLock(activity, locked);

                    return true;

src/com/android/settings/InstrumentedFragment.java

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ public abstract class InstrumentedFragment extends PreferenceFragment { 
    // Declare new temporary categories here, starting after this value.

    public static final int UNDECLARED = 100000;



    public static final int APPLICATIONS_MANAGE_ASSIST = UNDECLARED + 1;

    public static final int PROCESS_STATS_SUMMARY = UNDECLARED + 2;

    public static final int ACTION_ROTATION_LOCK = UNDECLARED + 3;



    /**

     * Declare the view of this category.

     *

src/com/android/settings/applications/ManageAssist.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.preference.Preference; 
import android.preference.SwitchPreference;

import android.provider.Settings;



import com.android.internal.logging.MetricsLogger;

import com.android.settings.InstrumentedFragment;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -47,7 +48,7 @@ public class ManageAssist extends SettingsPreferenceFragment 


    @Override

    protected int getMetricsCategory() {

        return InstrumentedFragment.APPLICATIONS_MANAGE_ASSIST;

        return MetricsLogger.APPLICATIONS_MANAGE_ASSIST;

    }



    @Override

src/com/android/settings/applications/ProcessStatsSummary.java

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.preference.Preference.OnPreferenceClickListener; 
import android.text.format.Formatter;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.settings.InstrumentedFragment;

import com.android.settings.R;

import com.android.settings.Utils;
@@ -102,7 +103,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc 


    @Override

    protected int getMetricsCategory() {

        return InstrumentedFragment.PROCESS_STATS_SUMMARY;

        return MetricsLogger.PROCESS_STATS_SUMMARY;

    }



    @Override