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

Commit a6a44807 authored by Edgar Wang's avatar Edgar Wang
Browse files

Fix SettingsHomepageActivityTest failed 

Fixes: 340439758
Test: atest SettingsHomepageActivityTest
Change-Id: I8f6fbb91f92982abd3b1ebadff763270537b9c3e
parent a71f46ec

res/layout/settings_homepage_container_v2.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:orientation="vertical">



            <FrameLayout

                android:id="@+id/unified_suggestion_content"

                android:id="@+id/suggestion_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="10dp"

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

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        }



        if (Flags.homepageRevamp()) {

            mSuggestionView = findViewById(R.id.unified_suggestion_content);

            mSuggestionView = findViewById(R.id.suggestion_content);

        } else {

            mSuggestionView = findViewById(R.id.suggestion_content);

            mTwoPaneSuggestionView = findViewById(R.id.two_pane_suggestion_content);
@@ -493,7 +493,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
                HOMEPAGE_LOADING_TIMEOUT_MS);

        if (Flags.homepageRevamp()) {

            showFragment(new SuggestionFragCreator(fragmentClass, true),

                    R.id.unified_suggestion_content);

                    R.id.suggestion_content);

        } else {

            showFragment(new SuggestionFragCreator(fragmentClass, /* isTwoPaneLayout= */ false),

                    R.id.suggestion_content);

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

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.pm.PackageManager; 
import android.net.Uri;

import android.os.Build;

import android.os.UserHandle;

import android.platform.test.annotations.DisableFlags;

import android.provider.Settings;

import android.util.ArraySet;

import android.view.View;
@@ -53,6 +54,7 @@ import androidx.test.core.app.ApplicationProvider; 


import com.android.settings.R;

import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;

import com.android.settings.flags.Flags;

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

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

import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -120,6 +122,7 @@ public class SettingsHomepageActivityTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)

    public void launch_configDisabled_shouldHideAvatar() {

        final SettingsHomepageActivity activity = Robolectric.buildActivity(

                SettingsHomepageActivity.class).create().get();
@@ -130,6 +133,7 @@ public class SettingsHomepageActivityTest { 


    @Test

    @Config(qualifiers = "mcc999")

    @DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)

    public void launch_configEnabled_shouldShowAvatar() {

        final SettingsHomepageActivity activity = Robolectric.buildActivity(

                SettingsHomepageActivity.class).create().get();
@@ -140,6 +144,7 @@ public class SettingsHomepageActivityTest { 


    @Test

    @Config(qualifiers = "mcc999")

    @DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)

    public void launch_LowRamDevice_shouldHideAvatar() {

        final ShadowActivityManager activityManager = Shadow.extract(

                ApplicationProvider.getApplicationContext().getSystemService(