Revert "Make subsettings display edge-to-edge"
This reverts commit c2a85a374d28612c8d51d72523b49f9c2856f96e.
Bug: 132672399
Bug: 132182711
Test: n/a
Reason for revert: b/132672399
Change-Id: Icb34ae5b16b7a32215fe2c1a5f0d0d028c91b2ca
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0603796..8e62c45 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -164,8 +164,7 @@
</receiver>
<activity android:name=".SubSettings"
- android:parentActivityName="Settings"
- android:theme="@style/Theme.SubSettings"/>
+ android:parentActivityName="Settings" />
<activity android:name=".Settings$CreateShortcutActivity"
android:label="@string/settings_shortcut">
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index f94d25d..7216d76 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -19,7 +19,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true"
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
@@ -31,5 +30,6 @@
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_height="fill_parent"
+ android:background="?android:attr/windowBackground" />
</LinearLayout>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4249f97..4edd943 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -27,11 +27,8 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
- <item name="android:clipToPadding">false</item>
- <item name="android:clipChildren">false</item>
<item name="android:listPreferredItemHeight">72dip</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 54c822e..4ac4be4 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -35,6 +35,7 @@
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.Button;
import androidx.annotation.Nullable;
@@ -50,6 +51,7 @@
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.backup.BackupSettingsHelper;
import com.android.settings.backup.UserBackupSettingsActivity;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.core.SettingsBaseActivity;
@@ -164,6 +166,8 @@
private Button mNextButton;
+ private ViewGroup mContent;
+
// Categories
private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
@@ -246,6 +250,8 @@
setContentView(R.layout.settings_main_prefs);
+ mContent = findViewById(R.id.main_content);
+
getSupportFragmentManager().addOnBackStackChangedListener(this);
if (savedState != null) {
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 6dfdef4..cd13654 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -66,12 +66,7 @@
requestWindowFeature(Window.FEATURE_NO_TITLE);
}
super.setContentView(R.layout.settings_base_layout);
- final View decorView = getWindow().getDecorView();
- decorView.setSystemUiVisibility(
- decorView.getSystemUiVisibility()
- | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
final Toolbar toolbar = findViewById(R.id.action_bar);
if (theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {
toolbar.setVisibility(View.GONE);
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index fa23101..e767664 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -27,16 +27,16 @@
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
import com.android.settings.accounts.AvatarViewMixin;
+import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.overlay.FeatureFactory;
-public class SettingsHomepageActivity extends FragmentActivity {
+public class SettingsHomepageActivity extends SettingsBaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {