PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix SettingsHomepageActivityTest failed" into main

Browse Source
This commit is contained in:
Edgar Wang
2024-05-16 01:00:19 +00:00
committed by Android (Google) Code Review
parent 629fd6c680 a6a4480736
commit 4d491bcd30
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/settings_homepage_container_v2.xml
View File

@@ -35,7 +35,7 @@
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/unified_suggestion_content" android:id="@+id/suggestion_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"

4
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -479,7 +479,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
} }
if (Flags.homepageRevamp()) { if (Flags.homepageRevamp()) {
mSuggestionView = findViewById(R.id.unified_suggestion_content); mSuggestionView = findViewById(R.id.suggestion_content);
} else { } else {
mSuggestionView = findViewById(R.id.suggestion_content); mSuggestionView = findViewById(R.id.suggestion_content);
mTwoPaneSuggestionView = findViewById(R.id.two_pane_suggestion_content); mTwoPaneSuggestionView = findViewById(R.id.two_pane_suggestion_content);
@@ -493,7 +493,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
HOMEPAGE_LOADING_TIMEOUT_MS); HOMEPAGE_LOADING_TIMEOUT_MS);
if (Flags.homepageRevamp()) { if (Flags.homepageRevamp()) {
showFragment(new SuggestionFragCreator(fragmentClass, true), showFragment(new SuggestionFragCreator(fragmentClass, true),
R.id.unified_suggestion_content); R.id.suggestion_content);
} else { } else {
showFragment(new SuggestionFragCreator(fragmentClass, /* isTwoPaneLayout= */ false), showFragment(new SuggestionFragCreator(fragmentClass, /* isTwoPaneLayout= */ false),
R.id.suggestion_content); R.id.suggestion_content);

5
tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
View File

@@ -41,6 +41,7 @@ import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.UserHandle; import android.os.UserHandle;
import android.platform.test.annotations.DisableFlags;
import android.provider.Settings; import android.provider.Settings;
import android.util.ArraySet; import android.util.ArraySet;
import android.view.View; import android.view.View;
@@ -53,6 +54,7 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; 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.ShadowActivityEmbeddingUtils;
import com.android.settings.testutils.shadow.ShadowPasswordUtils; import com.android.settings.testutils.shadow.ShadowPasswordUtils;
import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -120,6 +122,7 @@ public class SettingsHomepageActivityTest {
} }
@Test @Test
@DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
public void launch_configDisabled_shouldHideAvatar() { public void launch_configDisabled_shouldHideAvatar() {
final SettingsHomepageActivity activity = Robolectric.buildActivity( final SettingsHomepageActivity activity = Robolectric.buildActivity(
SettingsHomepageActivity.class).create().get(); SettingsHomepageActivity.class).create().get();
@@ -130,6 +133,7 @@ public class SettingsHomepageActivityTest {
@Test @Test
@Config(qualifiers = "mcc999") @Config(qualifiers = "mcc999")
@DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
public void launch_configEnabled_shouldShowAvatar() { public void launch_configEnabled_shouldShowAvatar() {
final SettingsHomepageActivity activity = Robolectric.buildActivity( final SettingsHomepageActivity activity = Robolectric.buildActivity(
SettingsHomepageActivity.class).create().get(); SettingsHomepageActivity.class).create().get();
@@ -140,6 +144,7 @@ public class SettingsHomepageActivityTest {
@Test @Test
@Config(qualifiers = "mcc999") @Config(qualifiers = "mcc999")
@DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
public void launch_LowRamDevice_shouldHideAvatar() { public void launch_LowRamDevice_shouldHideAvatar() {
final ShadowActivityManager activityManager = Shadow.extract( final ShadowActivityManager activityManager = Shadow.extract(
ApplicationProvider.getApplicationContext().getSystemService( ApplicationProvider.getApplicationContext().getSystemService(