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

Commit 7448b324 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "catalyst-ScreenTimeout" into main 

* changes:
  [Catalyst] Migrate "Screen attention"
  [Catalyst] Support RadioButtonPickerFragment
  [Catalyst] Add initial ScreenTimeoutScreen
  Refactor duplicate isAdaptiveSleepSupported
parents f7668f4d dec8370d

src/com/android/settings/SettingsPreferenceFragment.java

+21 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.Button;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.XmlRes;

import androidx.fragment.app.DialogFragment;
@@ -54,6 +56,7 @@ import com.android.settings.widget.LoadingViewController; 
import com.android.settingslib.CustomDialogPreferenceCompat;

import com.android.settingslib.CustomEditTextPreferenceCompat;

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

import com.android.settingslib.preference.PreferenceScreenCreator;

import com.android.settingslib.search.Indexable;

import com.android.settingslib.widget.LayoutPreference;
@@ -176,6 +179,24 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
        }

    }



    @Override

    protected final int getPreferenceScreenResId(@NonNull Context context) {

        return getPreferenceScreenResId();

    }



    /** Returns if catalyst is enabled on current screen. */

    protected final boolean isCatalystEnabled() {

        return getPreferenceScreenCreator() != null;

    }



    protected @Nullable PreferenceScreenCreator getPreferenceScreenCreator() {

        if (!Flags.catalyst()) {

            return null;

        }

        Context context = getContext();

        return context != null ? getPreferenceScreenCreator(context) : null;

    }



    public View setPinnedHeaderView(int layoutResId) {

        final LayoutInflater inflater = getActivity().getLayoutInflater();

        final View pinnedHeader =

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc 
        mMetricsFeatureProvider.logClickedPreference(preference, getMetricsCategory());

    }



    private void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {

    protected void updateActivityTitleWithScreenTitle(PreferenceScreen screen) {

        if (screen != null) {

            final CharSequence title = screen.getTitle();

            if (!TextUtils.isEmpty(title)) {

src/com/android/settings/dashboard/DashboardFragment.java

+1 −19
Original line number Diff line number Diff line
@@ -308,11 +308,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
        super.onDestroy();

    }



    @Override

    protected final int getPreferenceScreenResId(@NonNull Context context) {

        return getPreferenceScreenResId();

    }



    @Override

    protected abstract int getPreferenceScreenResId();
@@ -413,7 +408,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
                removeControllersForHybridMode();

            }

            setPreferenceScreen(screen);

            requireActivity().setTitle(screen.getTitle());

            updateActivityTitleWithScreenTitle(screen);

        } else {

            addPreferencesFromResource(resId);

            screen = getPreferenceScreen();
@@ -447,19 +442,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
        }

    }



    /** Returns if catalyst is enabled on current screen. */

    protected final boolean isCatalystEnabled() {

        return getPreferenceScreenCreator() != null;

    }



    private @Nullable PreferenceScreenCreator getPreferenceScreenCreator() {

        if (!Flags.catalyst()) {

            return null;

        }

        Context context = getContext();

        return context != null ? getPreferenceScreenCreator(context) : null;

    }



    /**

     * Perform {@link AbstractPreferenceController#displayPreference(PreferenceScreen)}

     * on all {@link AbstractPreferenceController}s.

src/com/android/settings/display/AdaptiveSleepPreference.kt

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.display



import android.content.BroadcastReceiver

import android.content.Context

import android.content.Intent

import android.content.IntentFilter

import android.hardware.SensorPrivacyManager

import android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener

import android.hardware.SensorPrivacyManager.Sensors.CAMERA

import android.os.PowerManager

import android.os.UserManager

import android.provider.Settings

import com.android.settings.PreferenceRestrictionMixin

import com.android.settings.R

import com.android.settingslib.RestrictedSwitchPreference

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyedObservableDelegate

import com.android.settingslib.datastore.SettingsSecureStore

import com.android.settingslib.datastore.SettingsStore

import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.PreferenceLifecycleContext

import com.android.settingslib.metadata.PreferenceLifecycleProvider

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.TwoStatePreference

import com.android.settingslib.preference.PreferenceBindingPlaceholder

import com.android.settingslib.preference.SwitchPreferenceBinding



// LINT.IfChange

class AdaptiveSleepPreference :

    TwoStatePreference,

    SwitchPreferenceBinding,

    PreferenceLifecycleProvider,

    PreferenceBindingPlaceholder, // not needed once controller class is cleaned up

    PreferenceAvailabilityProvider,

    PreferenceRestrictionMixin {



    private var broadcastReceiver: BroadcastReceiver? = null

    private var sensorPrivacyChangedListener: OnSensorPrivacyChangedListener? = null



    override val key: String

        get() = KEY



    override val title: Int

        get() = R.string.adaptive_sleep_title



    override val summary: Int

        get() = R.string.adaptive_sleep_description



    override fun isIndexable(context: Context) = false



    override fun isEnabled(context: Context) =

        super<PreferenceRestrictionMixin>.isEnabled(context) && context.canBeEnabled()



    override val restrictionKeys: Array<String>

        get() = arrayOf(UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT)



    override fun isAvailable(context: Context) = context.isAdaptiveSleepSupported()



    override fun createWidget(context: Context) = RestrictedSwitchPreference(context)



    override fun storage(context: Context): KeyValueStore = Storage(context)



    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =

        ReadWritePermit.ALLOW



    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =

        ReadWritePermit.ALLOW



    @Suppress("UNCHECKED_CAST")

    private class Storage(

        private val context: Context,

        private val settingsStore: SettingsStore = SettingsSecureStore.get(context),

    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {



        override fun contains(key: String) = settingsStore.contains(key)



        override fun <T : Any> getValue(key: String, valueType: Class<T>) =

            (context.canBeEnabled() && settingsStore.getBoolean(key) == true) as T



        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) =

            settingsStore.setBoolean(key, value as Boolean?)

    }



    override fun onStart(context: PreferenceLifecycleContext) {

        val receiver =

            object : BroadcastReceiver() {

                override fun onReceive(receiverContext: Context, intent: Intent) {

                    context.notifyPreferenceChange(this@AdaptiveSleepPreference)

                }

            }

        context.registerReceiver(

            receiver,

            IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED),

        )

        broadcastReceiver = receiver



        val listener = OnSensorPrivacyChangedListener { _, _ ->

            context.notifyPreferenceChange(this)

        }

        SensorPrivacyManager.getInstance(context).addSensorPrivacyListener(CAMERA, listener)

        sensorPrivacyChangedListener = listener

    }



    override fun onStop(context: PreferenceLifecycleContext) {

        broadcastReceiver?.let { context.unregisterReceiver(it) }

        sensorPrivacyChangedListener?.let {

            SensorPrivacyManager.getInstance(context).removeSensorPrivacyListener(it)

        }

    }



    companion object {

        const val KEY = Settings.Secure.ADAPTIVE_SLEEP



        @Suppress("DEPRECATION")

        private fun Context.canBeEnabled() =

            AdaptiveSleepPreferenceController.hasSufficientPermission(packageManager) &&

                getSystemService(PowerManager::class.java)?.isPowerSaveMode != true &&

                !SensorPrivacyManager.getInstance(this).isSensorPrivacyEnabled(CAMERA)

    }

}

// LINT.ThenChange(AdaptiveSleepPreferenceController.java)

src/com/android/settings/display/AdaptiveSleepPreferenceController.java

+4 −24
Original line number Diff line number Diff line
@@ -20,19 +20,16 @@ import static android.hardware.SensorPrivacyManager.Sensors.CAMERA; 


import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;

import static com.android.settings.display.UtilsKt.isAdaptiveSleepSupported;



import android.Manifest;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.hardware.SensorPrivacyManager;

import android.os.PowerManager;

import android.os.UserManager;

import android.provider.Settings;

import android.service.attention.AttentionService;

import android.text.TextUtils;



import androidx.preference.PreferenceScreen;
@@ -45,9 +42,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; 


import com.google.common.annotations.VisibleForTesting;



// LINT.IfChange

/** The controller for Screen attention switch preference. */

public class AdaptiveSleepPreferenceController {

    public static final String PREFERENCE_KEY = "adaptive_sleep";

    public static final String PREFERENCE_KEY = Settings.Secure.ADAPTIVE_SLEEP;

    private static final int DEFAULT_VALUE = 0;

    private final SensorPrivacyManager mPrivacyManager;

    private final RestrictionUtils mRestrictionUtils;
@@ -144,28 +142,10 @@ public class AdaptiveSleepPreferenceController { 
                : UNSUPPORTED_ON_DEVICE;

    }



    static boolean isAdaptiveSleepSupported(Context context) {

        return context.getResources().getBoolean(

                com.android.internal.R.bool.config_adaptive_sleep_available)

                && isAttentionServiceAvailable(context);

    }



    private static boolean isAttentionServiceAvailable(Context context) {

        final PackageManager packageManager = context.getPackageManager();

        final String resolvePackage = packageManager.getAttentionServicePackageName();

        if (TextUtils.isEmpty(resolvePackage)) {

            return false;

        }

        final Intent intent = new Intent(AttentionService.SERVICE_INTERFACE).setPackage(

                resolvePackage);

        final ResolveInfo resolveInfo = packageManager.resolveService(intent,

                PackageManager.MATCH_SYSTEM_ONLY);

        return resolveInfo != null && resolveInfo.serviceInfo != null;

    }



    static boolean hasSufficientPermission(PackageManager packageManager) {

        final String attentionPackage = packageManager.getAttentionServicePackageName();

        return attentionPackage != null && packageManager.checkPermission(

                Manifest.permission.CAMERA, attentionPackage) == PackageManager.PERMISSION_GRANTED;

    }

}

// LINT.ThenChange(AdaptiveSleepPreference.kt)