Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a51ede6 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev

parents ae6f6ab0 9e98b8cf

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -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">

res/layout/settings_base_layout.xml

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

res/values/themes.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/SettingsActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.UserManager; 
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 androidx.preference.PreferenceManager; 
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;
@@ -166,6 +168,8 @@ public class SettingsActivity extends SettingsBaseActivity 


    private Button mNextButton;



    private ViewGroup mContent;



    // Categories

    private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
@@ -250,6 +254,8 @@ public class SettingsActivity extends SettingsBaseActivity 


        setContentView(R.layout.settings_main_prefs);



        mContent = findViewById(R.id.main_content);



        getSupportFragmentManager().addOnBackStackChangedListener(this);



        if (savedState != null) {

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

+0 −5
Original line number Diff line number Diff line
@@ -73,12 +73,7 @@ public class SettingsBaseActivity extends FragmentActivity { 
            setTheme(R.style.LightTheme_SubSettings_SetupWizard);

        }

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