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

Commit 16a81eb3 authored by Raff Tsai's avatar Raff Tsai
Browse files

Sync lastest lifecycle interface 

Bug: 142938506
Test: rebuild
Change-Id: I6a8d75e5a3ba8564cfb400a88d6582c962c965ee
parent be658e94

src/com/android/settings/EncryptionInterstitial.java

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityManager;

import android.widget.LinearLayout;

import android.widget.TextView;



import androidx.appcompat.app.AlertDialog;

src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.appcompat.app.AlertDialog; 


import com.android.settings.R;

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

import com.android.settings.notification.ZenAccessSettings;



/**

 * Warning dialog when allowing zen access warning about the privileges being granted.

src/com/android/settings/bluetooth/Utils.java

+3 −2
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ public final class Utils { 
    @VisibleForTesting

    static void showConnectingError(Context context, String name, LocalBluetoothManager manager) {

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

            SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR);

                SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR,

                0);

        showError(context, name, R.string.bluetooth_connecting_error_message, manager);

    }

src/com/android/settings/core/InstrumentedFragment.java

+0 −4
Original line number Diff line number Diff line
@@ -47,8 +47,4 @@ public abstract class InstrumentedFragment extends ObservableFragment implements 
        mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());

        super.onResume();

    }



    protected final VisibilityLoggerMixin getVisibilityLogger() {

        return mVisibilityLoggerMixin;

    }

}

src/com/android/settings/core/InstrumentedPreferenceFragment.java

+0 −4
Original line number Diff line number Diff line
@@ -91,10 +91,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc 
        return getPreferenceManager().getContext();

    }



    protected final VisibilityLoggerMixin getVisibilityLogger() {

        return mVisibilityLoggerMixin;

    }



    /**

     * Get the res id for static preference xml for this fragment.

     */