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

Commit 5267c766 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Move FeatureFlags to flags package."

parents 07b6006b cfac4b65

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.TaskStackChangeListeners;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.telephony.TelephonyListenerManager;

packages/SystemUI/src/com/android/systemui/Dependency.java

+1 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;
@@ -73,7 +74,6 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; 
import com.android.systemui.shared.system.DevicePolicyManagerWrapper;

import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.demomode.dagger.DemoModeModule;

import com.android.systemui.doze.dagger.DozeComponent;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.log.dagger.LogModule;

import com.android.systemui.model.SysUiState;
@@ -47,7 +48,6 @@ import com.android.systemui.screenshot.dagger.ScreenshotModule; 
import com.android.systemui.settings.dagger.SettingsModule;

import com.android.systemui.shared.system.smartspace.SmartspaceTransitionController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

packages/SystemUI/src/com/android/systemui/flags/FeatureFlagReader.java

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.annotation.Nullable; 
import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.util.wrapper.BuildInfo;



import javax.inject.Inject;

packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java→packages/SystemUI/src/com/android/systemui/flags/FeatureFlags.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 * Copyright (C) 2021 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.
@@ -14,14 +14,13 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar;

package com.android.systemui.flags;



import android.content.Context;

import android.util.FeatureFlagUtils;



import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.flags.FeatureFlagReader;



import javax.inject.Inject;
@@ -53,6 +52,7 @@ public class FeatureFlags { 
        return mFlagReader.isEnabled(R.bool.flag_keyguard_layout);

    }



    /** */

    public boolean useNewLockscreenAnimations() {

        return mFlagReader.isEnabled(R.bool.flag_lockscreen_animations);

    }