Merge "Remove feature flag for contextual home." (6b12d799) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -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"

res/layout/settings_main_dashboard.xml

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		<?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

res/values/themes.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -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>

src/com/android/settings/SettingsActivity.java

+3 −24

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.settings;

		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.util.Log;
		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 @@ public class SettingsActivity extends SettingsBaseActivity

		private Button mNextButton;

		/**
		* TODO(b/118444000): Remove this and all related code.
		*/
		@Deprecated
		private boolean mIsShowingDashboard;

		private ViewGroup mContent;

		// Categories
		@@ -253,11 +245,7 @@ public class SettingsActivity extends SettingsBaseActivity
		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 @@ public class SettingsActivity extends SettingsBaseActivity
		}

		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) {

src/com/android/settings/core/FeatureFlags.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ package com.android.settings.core;
		*/
		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";