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

Commit b6e33a1c authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[Disable Flags] Move DisableFlagsLogger to the disableflags package."

parents 93fff8dd f9288d1d

core/java/android/app/StatusBarManager.java

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class StatusBarManager { 
    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Disable2Flags {}

    // LINT.ThenChange(frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/DisableFlagsLogger.kt)

    // LINT.ThenChange(frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/disableflags/DisableFlagsLogger.kt)



    /**

     * Default disable flags for setup

packages/SystemUI/ktfmt_includes.txt

+2 −2
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/ActionClickLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBarWifiView.kt

-packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt

-packages/SystemUI/src/com/android/systemui/statusbar/DisableFlagsLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt

-packages/SystemUI/src/com/android/systemui/statusbar/LockScreenShadeOverScroller.kt

-packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeKeyguardTransitionController.kt
@@ -356,6 +355,7 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiStatusTrackerFactory.kt

-packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt

-packages/SystemUI/src/com/android/systemui/statusbar/dagger/StartCentralSurfacesModule.kt

-packages/SystemUI/src/com/android/systemui/statusbar/disableflags/DisableFlagsLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt

-packages/SystemUI/src/com/android/systemui/statusbar/events/StatusEvent.kt

-packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt
@@ -744,7 +744,6 @@ 
-packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenAndDreamTargetFilterTest.kt

-packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/BlurUtilsTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/DisableFlagsLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/LSShadeTransitionLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/LightRevealScrimTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
@@ -757,6 +756,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/VibratorHelperTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/commandline/CommandRegistryTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/disableflags/DisableFlagsLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/gesture/GenericGestureDetectorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorControllerTest.kt

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS; 


import static com.android.systemui.media.dagger.MediaModule.QS_PANEL;

import static com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL;

import static com.android.systemui.statusbar.DisableFlagsLogger.DisableState;

import static com.android.systemui.statusbar.disableflags.DisableFlagsLogger.DisableState;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

packages/SystemUI/src/com/android/systemui/qs/QSFragmentDisableFlagsLogger.kt

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package com.android.systemui.qs 
import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel

import com.android.systemui.log.dagger.QSFragmentDisableLog

import com.android.systemui.statusbar.DisableFlagsLogger

import com.android.systemui.statusbar.disableflags.DisableFlagsLogger

import javax.inject.Inject



/** A helper class for logging disable flag changes made in [QSFragment]. */

packages/SystemUI/src/com/android/systemui/statusbar/DisableFlagsLogger.kt→packages/SystemUI/src/com/android/systemui/statusbar/disableflags/DisableFlagsLogger.kt

+8 −8
Original line number Diff line number Diff line
@@ -13,23 +13,23 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.statusbar

package com.android.systemui.statusbar.disableflags



import android.app.StatusBarManager.DISABLE2_GLOBAL_ACTIONS

import android.app.StatusBarManager.DISABLE2_NOTIFICATION_SHADE

import android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS

import android.app.StatusBarManager.DISABLE2_ROTATE_SUGGESTIONS

import android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS

import android.app.StatusBarManager.DISABLE_BACK

import android.app.StatusBarManager.DISABLE_CLOCK

import android.app.StatusBarManager.DISABLE_EXPAND

import android.app.StatusBarManager.DISABLE_HOME

import android.app.StatusBarManager.DISABLE_NOTIFICATION_ICONS

import android.app.StatusBarManager.DISABLE_NOTIFICATION_ALERTS

import android.app.StatusBarManager.DISABLE_NOTIFICATION_ICONS

import android.app.StatusBarManager.DISABLE_ONGOING_CALL_CHIP

import android.app.StatusBarManager.DISABLE_RECENT

import android.app.StatusBarManager.DISABLE_SEARCH

import android.app.StatusBarManager.DISABLE_SYSTEM_INFO

import android.app.StatusBarManager.DISABLE2_GLOBAL_ACTIONS

import android.app.StatusBarManager.DISABLE2_NOTIFICATION_SHADE

import android.app.StatusBarManager.DISABLE2_ROTATE_SUGGESTIONS

import android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS

import android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS

import com.android.systemui.dagger.SysUISingleton

import javax.inject.Inject