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

Commit c2a85a37 authored by Fan Zhang's avatar Fan Zhang
Browse files

Make subsettings display edge-to-edge 

Fixes: 132182711
Test: visual
Change-Id: I3b0635cba359f74d463c2360323d80c5c9533228
parent dcf21d4b

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ 
        </receiver>



        <activity android:name=".SubSettings"

                android:parentActivityName="Settings" />

                android:parentActivityName="Settings"

                android:theme="@style/Theme.SubSettings"/>



        <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,6 +19,7 @@ 
    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"
@@ -30,6 +31,5 @@ 
    <FrameLayout

        android:id="@+id/content_frame"

        android:layout_width="match_parent"

        android:layout_height="fill_parent"

        android:background="?android:attr/windowBackground" />

        android:layout_height="match_parent"/>

</LinearLayout>

res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ 


    <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

+0 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 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;
@@ -51,7 +50,6 @@ 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,8 +164,6 @@ public class SettingsActivity extends SettingsBaseActivity 


    private Button mNextButton;



    private ViewGroup mContent;



    // Categories

    private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
@@ -250,8 +246,6 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -66,7 +66,12 @@ public class SettingsBaseActivity extends FragmentActivity { 
            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);