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

Commit 0a9a9f0d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Stop system bar areas from being transparent" into main

parents 66c73955 b2cb6066

res/flag(com.android.documentsui.flags.use_material3)/values/themes.xml

+4 −0
Original line number Diff line number Diff line
@@ -79,5 +79,9 @@ 


        <!-- Menu text appearance -->

        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>



        <!-- System bar colors. -->

        <item name="android:statusBarColor">?attr/colorSurfaceContainer</item>

        <item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>

    </style>

</resources>

src/com/android/documentsui/files/FilesActivity.java

+7 −3
Original line number Diff line number Diff line
@@ -210,9 +210,13 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler 
            updateTaskDescription(intent);

        }



        // When the use_material3 flag is on, the file path bar is at the bottom of the layout and

        // hence the edge to edge nav bar is no longer required.

        if (!isUseMaterial3FlagEnabled()) {

            // Set save container background to transparent for edge to edge nav bar.

            View saveContainer = findViewById(R.id.container_save);

            saveContainer.setBackgroundColor(Color.TRANSPARENT);

        }



        presentFileErrors(icicle, intent);

    }

src/com/android/documentsui/picker/PickActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -224,9 +224,11 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons { 
        } else if (mState.action == ACTION_OPEN_TREE ||

                mState.action == ACTION_PICK_COPY_DESTINATION) {

            PickFragment.show(getSupportFragmentManager());

        } else {

        } else if (!isUseMaterial3FlagEnabled()) {

            // If PickFragment or SaveFragment does not show,

            // Set save container background to transparent for edge to edge nav bar.

            // However when the use_material3 flag is on, the file path bar is at the bottom of the

            // layout and hence the edge to edge nav bar is no longer required.

            View saveContainer = findViewById(R.id.container_save);

            saveContainer.setBackgroundColor(Color.TRANSPARENT);

        }