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

Commit d28730e0 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Change predictive back system animations flag to runtime flag" into main

parents 87e9f512 161f2806

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.development;



import static com.android.window.flags.Flags.predictiveBackSystemAnimations;

import static com.android.window.flags.Flags.predictiveBackSystemAnims;



import android.content.Context;

import android.provider.Settings;
@@ -57,7 +57,7 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc 


    @Override

    public boolean isAvailable() {

        return !predictiveBackSystemAnimations();

        return !predictiveBackSystemAnims();

    }



    @Override

tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -91,13 +91,13 @@ public class BackAnimationPreferenceControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS)

    @RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS)

    public void controllerNotAvailable_whenAconfigFlagEnabled() {

        assertFalse(mController.isAvailable());

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMATIONS)

    @RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS)

    public void controllerAvailable_whenAconfigFlagDisabled() {

        assertTrue(mController.isAvailable());

    }