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

Commit d072e850 authored by Mill Chen's avatar Mill Chen
Browse files

Restructure app info page 

When the collapsing toolbar is applied in the Settings app, some pages
they used manage_applications_apps will have the collapsing toolbar not
work properly. This was caused by using multiple CoordinatorLayout and
AppBarLayout in these pages.

Bug: 177375909
Test: visual verified
Change-Id: Ibfeeab9cf907a23d18ee1ec2c450c523316cfc92
parent 9e949b19

res/layout/manage_applications_apps_v2.xml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<FrameLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <FrameLayout

        android:id="@+id/pinned_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="2dp"/>



    <FrameLayout

        android:id="@+id/list_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone">



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/apps_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:clipToPadding="false"

            android:scrollbars="none"

            settings:fastScrollEnabled="true"

            settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"

            settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"

            settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"

            settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>



        <TextView

            android:id="@android:id/empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center"

            android:layout_gravity="center"

            android:text="@string/no_applications"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:visibility="invisible"/>



    </FrameLayout>



    <include layout="@layout/loading_container"/>



</FrameLayout>

src/com/android/settings/applications/manageapplications/ManageApplications.java

+5 −1
Original line number Diff line number Diff line
@@ -398,7 +398,11 @@ public class ManageApplications extends InstrumentedFragment 
            return mRootView;

        }



        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {

            mRootView = inflater.inflate(R.layout.manage_applications_apps_v2, null);

        } else {

            mRootView = inflater.inflate(R.layout.manage_applications_apps, null);

        }

        mLoadingContainer = mRootView.findViewById(R.id.loading_container);

        mListContainer = mRootView.findViewById(R.id.list_container);

        if (mListContainer != null) {