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

Commit 39c8905f authored by Tsung-Mao Fang's avatar Tsung-Mao Fang
Browse files

Fix incorrect colored bar when task bar is hidden 

Set backgorund color on content id view instead of homepage view.
Also setup edge to edge for the homepage.

Fix: 215440529
Test: See correct ui on the two pane mode and regular phone.
Change-Id: I2d5988a489410e9620137bd6cf9607768787d4fc
parent dff5a34e

res/layout/settings_homepage_container.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/settings_homepage_container"

    android:id="@+id/settings_homepage_container"

    android:fitsSystemWindows="true"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent">

src/com/android/settings/homepage/SettingsHomepageActivity.java

+27 −2
Original line number Original line Diff line number Diff line
@@ -32,12 +32,17 @@ import android.util.ArraySet; 
import android.util.FeatureFlagUtils;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.util.Log;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.Window;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManager;

import android.widget.FrameLayout;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.ImageView;

import android.widget.Toolbar;

import android.widget.Toolbar;





import androidx.core.graphics.Insets;

import androidx.core.view.ViewCompat;

import androidx.core.view.WindowCompat;

import androidx.core.view.WindowInsetsCompat;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentManager;
@@ -149,7 +154,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
    @Override

    @Override

    protected void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);

        setupEdgeToEdge();

        setContentView(R.layout.settings_homepage_container);

        setContentView(R.layout.settings_homepage_container);



        mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);

        mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);

        mSplitController = SplitController.getInstance();

        mSplitController = SplitController.getInstance();

        mIsTwoPane = mSplitController.isActivityEmbedded(this);

        mIsTwoPane = mSplitController.isActivityEmbedded(this);
@@ -224,6 +231,24 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        }

        }

    }

    }





    private void setupEdgeToEdge() {

        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);

        ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content),

                (v, windowInsets) -> {

                    Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());

                    // Apply the insets as a margin to the view. Here the system is setting

                    // only the top dimensions.

                    ViewGroup.MarginLayoutParams mlp =

                            (ViewGroup.MarginLayoutParams) v.getLayoutParams();

                    mlp.topMargin = insets.top;

                    v.setLayoutParams(mlp);



                    // Return CONSUMED if you don't want the window insets to keep being

                    // passed down to descendant views.

                    return WindowInsetsCompat.CONSUMED;

                });

    }



    private void initSearchBarView() {

    private void initSearchBarView() {

        final Toolbar toolbar = findViewById(R.id.search_action_bar);

        final Toolbar toolbar = findViewById(R.id.search_action_bar);

        FeatureFactory.getFactory(this).getSearchFeatureProvider()

        FeatureFactory.getFactory(this).getSearchFeatureProvider()
@@ -265,7 +290,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        // Update status bar color

        // Update status bar color

        window.setStatusBarColor(color);

        window.setStatusBarColor(color);

        // Update content background.

        // Update content background.

        findViewById(R.id.settings_homepage_container).setBackgroundColor(color);

        findViewById(android.R.id.content).setBackgroundColor(color);

    }

    }





    private void showSuggestionFragment(boolean scrollNeeded) {

    private void showSuggestionFragment(boolean scrollNeeded) {