Remove feature flag for contextual home.
Fixes: 118444000
Test: rebuild
Change-Id: I4b42e22bd93c2d79bacbd40b28912b4e6808325a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a94801f..04595e5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -116,14 +116,6 @@
<uses-library android:name="org.apache.http.legacy" />
<!-- Settings -->
- <!-- TODO(b/118444000): Remove this. -->
- <activity android:name="SettingsActivity"
- android:label="@string/settings_label_launcher"
- android:launchMode="singleTask">
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity>
-
<activity android:name=".homepage.SettingsHomepageActivity"
android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home"
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
deleted file mode 100644
index ee84576..0000000
--- a/res/layout/settings_main_dashboard.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- TODO(118444000): Remove this -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <include layout="@layout/search_bar" />
-
- <FrameLayout
- android:id="@+id/main_content"
- android:layout_height="match_parent"
- android:layout_width="match_parent" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f2c1eae..0de199f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -58,10 +58,6 @@
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_color_light</item>
- <!-- TODO(118444000): Remove colorPrimary and colorPrimaryVariant -->
- <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="colorPrimaryVariant">@android:color/white</item>
-
<!-- For slice view in settings -->
<item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
</style>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8bd81ee..541ca3a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -18,7 +18,6 @@
import android.app.ActionBar;
import android.app.ActivityManager;
-import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -37,7 +36,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.Toolbar;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
@@ -165,12 +163,6 @@
private Button mNextButton;
- /**
- * TODO(b/118444000): Remove this and all related code.
- */
- @Deprecated
- private boolean mIsShowingDashboard;
-
private ViewGroup mContent;
// Categories
@@ -253,11 +245,7 @@
setTheme(R.style.Theme_SubSettings);
}
- mIsShowingDashboard = TextUtils.equals(
- SettingsActivity.class.getName(), intent.getComponent().getClassName());
-
- setContentView(mIsShowingDashboard ?
- R.layout.settings_main_dashboard : R.layout.settings_main_prefs);
+ setContentView(R.layout.settings_main_prefs);
mContent = findViewById(R.id.main_content);
@@ -280,21 +268,12 @@
}
final boolean deviceProvisioned = Utils.isDeviceProvisioned(this);
- if (mIsShowingDashboard) {
- findViewById(R.id.search_bar).setVisibility(
- deviceProvisioned ? View.VISIBLE : View.INVISIBLE);
- findViewById(R.id.action_bar).setVisibility(View.GONE);
- final Toolbar toolbar = findViewById(R.id.search_action_bar);
- setActionBar(toolbar);
- FeatureFactory.getFactory(this).getSearchFeatureProvider()
- .initSearchToolbar(this, toolbar, SettingsEnums.SETTINGS_HOMEPAGE);
- }
- ActionBar actionBar = getActionBar();
+ final ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
actionBar.setHomeButtonEnabled(deviceProvisioned);
- actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard);
+ actionBar.setDisplayShowTitleEnabled(true);
}
mSwitchBar = findViewById(R.id.switch_bar);
if (mSwitchBar != null) {
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index 78fdfe7..f2ffe22 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -21,7 +21,6 @@
*/
public class FeatureFlags {
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
- public static final String DYNAMIC_HOMEPAGE = "settings_dynamic_homepage";
public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";
public static final String WIFI_MAC_RANDOMIZATION = "settings_wifi_mac_randomization";
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 7c5f928..9e869a9 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -18,9 +18,7 @@
import android.animation.LayoutTransition;
import android.app.settings.SettingsEnums;
-import android.content.Intent;
import android.os.Bundle;
-import android.util.FeatureFlagUtils;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
@@ -32,9 +30,7 @@
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
-import com.android.settings.SettingsActivity;
import com.android.settings.accounts.AvatarViewMixin;
-import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -45,13 +41,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (!FeatureFlagUtils.isEnabled(this, FeatureFlags.DYNAMIC_HOMEPAGE)) {
- final Intent settings = new Intent(this, SettingsActivity.class);
- startActivity(settings);
- finish();
- return;
- }
-
updateWindowProperties();
setContentView(R.layout.settings_homepage_container);
setHomepageContainerPaddingTop();
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index df9e85d..50a798f 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -18,37 +18,20 @@
import static com.google.common.truth.Truth.assertThat;
-import android.util.FeatureFlagUtils;
import android.view.View;
import android.widget.FrameLayout;
import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.FeatureFlags;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.shadows.ShadowActivity;
@RunWith(RobolectricTestRunner.class)
public class SettingsHomepageActivityTest {
@Test
- public void launch_featureFlagOff_shouldRedirectToSettingsActivity() {
- FeatureFlagUtils.setEnabled(RuntimeEnvironment.application, FeatureFlags.DYNAMIC_HOMEPAGE,
- false);
-
- final ShadowActivity shadowActivity = Shadows.shadowOf(
- Robolectric.setupActivity(SettingsHomepageActivity.class));
- assertThat(shadowActivity.getNextStartedActivity().getComponent().getClassName())
- .isEqualTo(SettingsActivity.class.getName());
- }
-
- @Test
public void setHomepageContainerPaddingTop_shouldBeSetPaddingTop() {
final SettingsHomepageActivity activity = Robolectric.buildActivity(
SettingsHomepageActivity.class).create().get();