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

Commit aff80d1e authored by Alex Stetson's avatar Alex Stetson
Browse files

Use shared model for non-system overlay toggle 

Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.

Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
parent f9ebf660

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

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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 android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



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

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



import android.app.Activity;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.VisibleForTesting;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;



import com.android.settings.development.OverlaySettingsPreferenceController;





/**

 * A mixin that adds window flag to prevent non-system overlays showing on top of Settings

 * activities.

 */

public class HideNonSystemOverlayMixin implements LifecycleObserver {



    private final Activity mActivity;



    public HideNonSystemOverlayMixin(Activity activity) {

        mActivity = activity;

    }



    @VisibleForTesting

    boolean isEnabled() {

        return !OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mActivity);

    }



    @OnLifecycleEvent(ON_START)

    public void onStart() {

        if (mActivity == null || !isEnabled()) {

            return;

        }

        mActivity.getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        android.util.EventLog.writeEvent(0x534e4554, "120484087", -1, "");

    }





    @OnLifecycleEvent(ON_STOP)

    public void onStop() {

        if (mActivity == null || !isEnabled()) {

            return;

        }

        final Window window = mActivity.getWindow();

        final WindowManager.LayoutParams attrs = window.getAttributes();

        attrs.privateFlags &= ~SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

        window.setAttributes(attrs);

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.settings.R; 
import com.android.settings.SubSettings;

import com.android.settings.Utils;

import com.android.settings.dashboard.CategoryManager;

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

import com.android.settingslib.drawer.Tile;

import com.android.settingslib.transition.SettingsTransitionHelper;

src/com/android/settings/development/OverlaySettingsPreferenceController.java

+9 −9
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


package com.android.settings.development;



import static com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin.SECURE_OVERLAY_SETTINGS;



import android.content.Context;

import android.content.SharedPreferences;

import android.provider.Settings;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;
@@ -33,7 +35,6 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; 
public class OverlaySettingsPreferenceController extends DeveloperOptionsPreferenceController

        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



    public static final String SHARE_PERFS = "overlay_settings";

    private static final String KEY_OVERLAY_SETTINGS = "overlay_settings";



    public OverlaySettingsPreferenceController(Context context) {
@@ -64,10 +65,10 @@ public class OverlaySettingsPreferenceController extends DeveloperOptionsPrefere 
    /**

     * Check if this setting is enabled or not.

     */

    public static boolean isOverlaySettingsEnabled(Context context) {

        final SharedPreferences editor = context.getSharedPreferences(SHARE_PERFS,

                Context.MODE_PRIVATE);

        return editor.getBoolean(SHARE_PERFS, false /* defValue */);

    @VisibleForTesting

    static boolean isOverlaySettingsEnabled(Context context) {

        return Settings.Secure.getInt(context.getContentResolver(),

                SECURE_OVERLAY_SETTINGS, 0 /* defValue */) != 0;

    }



    /**
@@ -75,9 +76,8 @@ public class OverlaySettingsPreferenceController extends DeveloperOptionsPrefere 
     */

    @VisibleForTesting

    static void setOverlaySettingsEnabled(Context context, boolean enabled) {

        final SharedPreferences editor = context.getSharedPreferences(SHARE_PERFS,

                Context.MODE_PRIVATE);

        editor.edit().putBoolean(SHARE_PERFS, enabled).apply();

        Settings.Secure.putInt(context.getContentResolver(),

                SECURE_OVERLAY_SETTINGS, enabled ? 1 : 0);

    }



    @Override

src/com/android/settings/homepage/SettingsHomepageActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.accounts.AvatarViewMixin;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.HideNonSystemOverlayMixin;

import com.android.settings.homepage.contextualcards.ContextualCardsFragment;

import com.android.settings.overlay.FeatureFactory;

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

import com.android.settingslib.transition.SettingsTransitionHelper;



public class SettingsHomepageActivity extends FragmentActivity {

src/com/android/settings/notification/app/ChannelPanelActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -31,10 +31,9 @@ import androidx.annotation.Nullable; 
import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.HideNonSystemOverlayMixin;

import com.android.settings.core.SubSettingLauncher;

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



/**

 * Dialog Activity to host channel settings