ApnSettingsActivity shows the ActionBar
- Use the Theme.Settings.NoActionBar - Update test cases Fixes: 331308440 Test: atest com.android.settings.UtilsTest SettingsActivityTest Change-Id: Ica93e765690707654ae651261ac8d236ed8e1d58
This commit is contained in:
@@ -152,7 +152,7 @@
|
||||
android:name=".SettingsApplication"
|
||||
android:label="@string/settings_label"
|
||||
android:icon="@drawable/ic_launcher_settings"
|
||||
android:theme="@style/Theme.Settings"
|
||||
android:theme="@style/Theme.Settings.NoActionBar"
|
||||
android:hardwareAccelerated="true"
|
||||
android:requiredForAllUsers="true"
|
||||
android:supportsRtl="true"
|
||||
|
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.ActionBar;
|
||||
import android.app.ActivityManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
@@ -114,6 +115,15 @@ public class SettingsActivityTest {
|
||||
assertThat(((ListenerFragment) fragments.get(1)).mOnActivityResultCalled).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getActionBar_hasNoActionBar() {
|
||||
final SettingsActivity activity = Robolectric.buildActivity(SettingsActivity.class).get();
|
||||
|
||||
final ActionBar actionBar = activity.getActionBar();
|
||||
|
||||
assertThat(actionBar).isNull();
|
||||
}
|
||||
|
||||
public static class ListenerFragment extends Fragment implements OnActivityResultListener {
|
||||
|
||||
private boolean mOnActivityResultCalled;
|
||||
|
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.ActionBar;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.app.admin.DevicePolicyResourcesManager;
|
||||
import android.content.ComponentName;
|
||||
@@ -56,11 +55,9 @@ import android.os.storage.StorageManager;
|
||||
import android.os.storage.VolumeInfo;
|
||||
import android.util.IconDrawableFactory;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.core.graphics.drawable.IconCompat;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
|
||||
@@ -71,7 +68,6 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
@@ -270,17 +266,6 @@ public class UtilsTest {
|
||||
Utils.setActionBarShadowAnimation(null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setActionBarShadowAnimation_shouldSetElevationToZero() {
|
||||
final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
|
||||
final ActionBar actionBar = activity.getActionBar();
|
||||
|
||||
Utils.setActionBarShadowAnimation(activity, activity.getLifecycle(),
|
||||
new ScrollView(mContext));
|
||||
|
||||
assertThat(actionBar.getElevation()).isEqualTo(0.f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSettingsIntelligence_IsSI_returnTrue() {
|
||||
final String siPackageName = mContext.getString(
|
||||
|
Reference in New Issue
Block a user