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

Commit b684a8db authored by Yi-Ling Chuang's avatar Yi-Ling Chuang
Browse files

Improve the animation while opening search 

Remove the exit transition on the homepage.

Fixes: 189390497
Test: robotest and launch search seeing the y-axis transition
Change-Id: Ia791757e0fef51eeefc7442e04369016a6200f84
parent 186254c6

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

+0 −21
Original line number Diff line number Diff line
@@ -18,14 +18,11 @@ package com.android.settings.homepage; 


import android.animation.LayoutTransition;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.os.Bundle;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.View;

import android.view.Window;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.Toolbar;
@@ -36,13 +33,11 @@ import androidx.fragment.app.FragmentManager; 
import androidx.fragment.app.FragmentTransaction;



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.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 {
@@ -69,12 +64,6 @@ public class SettingsHomepageActivity extends FragmentActivity { 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        if (Utils.isPageTransitionEnabled(this)) {

            // Enable Activity transitions

            getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);

            SettingsTransitionHelper.applyForwardTransition(this);

            SettingsTransitionHelper.applyBackwardTransition(this);

        }

        super.onCreate(savedInstanceState);

        setContentView(R.layout.settings_homepage_container);
@@ -107,16 +96,6 @@ public class SettingsHomepageActivity extends FragmentActivity { 
                .getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);

    }



    @Override

    public void startActivity(Intent intent) {

        if (Utils.isPageTransitionEnabled(this)) {

            final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(this).toBundle();

            super.startActivity(intent, bundle);

            return;

        }

        super.startActivity(intent);

    }



    private void showSuggestionFragment() {

        final Class<? extends Fragment> fragment = FeatureFactory.getFactory(this)

                .getSuggestionFeatureProvider(this).getContextualSuggestionFragment();

tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java

+1 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.settings.R; 
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;

import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settings.testutils.shadow.ShadowUtils;

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



import org.junit.Before;
@@ -59,13 +58,12 @@ import org.robolectric.util.ReflectionHelpers; 


@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUserManager.class,

        SettingsHomepageActivityTest.ShadowSuggestionFeatureProviderImpl.class, ShadowUtils.class})

        SettingsHomepageActivityTest.ShadowSuggestionFeatureProviderImpl.class})

public class SettingsHomepageActivityTest {



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        ShadowUtils.setIsPageTransitionEnabled(false);

    }



    @Test