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

Commit c19031a7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix permissions scrolling."

parents 91bc792a 1dcb129f

res/layout/permissions_frame.xml

+15 −19
Original line number Diff line number Diff line
@@ -14,42 +14,38 @@ 
     limitations under the License.

-->



<LinearLayout

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:layout_height="match_parent">



    <androidx.core.widget.NestedScrollView

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fillViewport="true">

        android:layout_height="match_parent">



        <LinearLayout

        <androidx.core.widget.NestedScrollView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            android:layout_height="match_parent">



            <LinearLayout

            <FrameLayout

                android:id="@+id/prefs_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">

                android:layout_height="match_parent">



                <TextView

                    android:id="@+id/no_permissions"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:gravity="center_horizontal"

                    android:layout_height="match_parent"

                    android:gravity="center"

                    style="?android:attr/textAppearanceLarge">

                </TextView>



            </LinearLayout>

            </FrameLayout>



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

        </androidx.core.widget.NestedScrollView>



        </LinearLayout>

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



    </androidx.core.widget.NestedScrollView>

    </FrameLayout>



</LinearLayout>
 
</FrameLayout>

src/com/android/packageinstaller/permission/ui/handheld/PermissionsFrameFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat 
        mPreferencesContainer = (ViewGroup) super.onCreateView(

                inflater, mPrefsView, savedInstanceState);

        setLoading(mIsLoading, false, true /* force */);

        mPrefsView.addView(mPreferencesContainer, 0);

        mPrefsView.addView(mPreferencesContainer);

        return rootView;

    }