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

Commit f6a57353 authored by Jacky Wang's avatar Jacky Wang
Browse files

Move ObservablePreferenceFragment class 

Bug: 365922551
Flag: EXEMPT Move class only
Test: Presubmit
Change-Id: I17851055b09d73b95e6adaafbe96f4375d5f637e
parent be15428d

Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -94,8 +94,10 @@ android_library { 
        "MediaDrmSettingsFlagsLib",

        "Settings-change-ids",

        "SettingsLib",

        "SettingsLibDataStore",

        "SettingsLibActivityEmbedding",

        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibPreference",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "contextualcards",

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

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.android.settingslib.core.instrumentation.Instrumentable; 
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.instrumentation.SettingsJankMonitor;

import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;

import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;



/**

 * Instrumented fragment that logs visibility state.

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

0 → 100644
+137 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.settings.core;





import static androidx.lifecycle.Lifecycle.Event.ON_CREATE;

import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;

import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;

import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;

import static androidx.lifecycle.Lifecycle.Event.ON_START;

import static androidx.lifecycle.Lifecycle.Event.ON_STOP;



import android.annotation.CallSuper;

import android.content.Context;

import android.os.Bundle;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;



import androidx.lifecycle.LifecycleOwner;

import androidx.preference.PreferenceScreen;



import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.preference.PreferenceFragment;



/**

 * Preference fragment that has hooks to observe fragment lifecycle events.

 */

public abstract class ObservablePreferenceFragment extends PreferenceFragment

        implements LifecycleOwner {



    private final Lifecycle mLifecycle = new Lifecycle(this);



    public Lifecycle getSettingsLifecycle() {

        return mLifecycle;

    }



    @CallSuper

    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        mLifecycle.onAttach(context);

    }



    @CallSuper

    @Override

    public void onCreate(Bundle savedInstanceState) {

        mLifecycle.onCreate(savedInstanceState);

        mLifecycle.handleLifecycleEvent(ON_CREATE);

        super.onCreate(savedInstanceState);

    }



    @Override

    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {

        mLifecycle.setPreferenceScreen(preferenceScreen);

        super.setPreferenceScreen(preferenceScreen);

    }



    @CallSuper

    @Override

    public void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

        mLifecycle.onSaveInstanceState(outState);

    }



    @CallSuper

    @Override

    public void onStart() {

        mLifecycle.handleLifecycleEvent(ON_START);

        super.onStart();

    }



    @CallSuper

    @Override

    public void onResume() {

        mLifecycle.handleLifecycleEvent(ON_RESUME);

        super.onResume();

    }



    @CallSuper

    @Override

    public void onPause() {

        mLifecycle.handleLifecycleEvent(ON_PAUSE);

        super.onPause();

    }



    @CallSuper

    @Override

    public void onStop() {

        mLifecycle.handleLifecycleEvent(ON_STOP);

        super.onStop();

    }



    @CallSuper

    @Override

    public void onDestroy() {

        mLifecycle.handleLifecycleEvent(ON_DESTROY);

        super.onDestroy();

    }



    @CallSuper

    @Override

    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {

        mLifecycle.onCreateOptionsMenu(menu, inflater);

        super.onCreateOptionsMenu(menu, inflater);

    }



    @CallSuper

    @Override

    public void onPrepareOptionsMenu(final Menu menu) {

        mLifecycle.onPrepareOptionsMenu(menu);

        super.onPrepareOptionsMenu(menu);

    }



    @CallSuper

    @Override

    public boolean onOptionsItemSelected(final MenuItem menuItem) {

        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);

        if (!lifecycleHandled) {

            return super.onOptionsItemSelected(menuItem);

        }

        return lifecycleHandled;

    }

}

src/com/android/settings/security/OwnerInfoPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.core.ObservablePreferenceFragment;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.users.OwnerInfoSettings;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -31,7 +32,6 @@ import com.android.settingslib.RestrictedLockUtilsInternal; 
import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;

import com.android.settingslib.core.lifecycle.events.OnResume;



public class OwnerInfoPreferenceController extends AbstractPreferenceController

tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ import androidx.preference.PreferenceManager; 
import androidx.preference.PreferenceScreen;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.core.ObservablePreferenceFragment;

import com.android.settings.users.OwnerInfoSettings;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;



import org.junit.Before;

import org.junit.Test;