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

Commit 1e592796 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add "changes" dot to expanded fgs manager footer" into tm-dev am: 3dbbf608 am: f1e830f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18060414



Change-Id: I524c6be2a01ca667fe04455c9424189a29b8c2f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f28e2736 f1e830f2

packages/SystemUI/res-keyguard/layout/fgs_footer.xml

+10 −1
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ 
            android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

            android:textColor="?android:attr/textColorSecondary"/>



        <ImageView

            android:id="@+id/fgs_new"

            android:layout_width="12dp"

            android:layout_height="12dp"

            android:scaleType="fitCenter"

            android:src="@drawable/fgs_dot"

            android:contentDescription="@string/fgs_dot_content_description"

            />



        <ImageView

            android:id="@+id/footer_icon"

            android:layout_width="@dimen/qs_footer_icon_size"
@@ -82,7 +91,7 @@ 
            android:textColor="?android:attr/textColorPrimary"

            android:textSize="18sp"/>

        <ImageView

            android:id="@+id/fgs_new"

            android:id="@+id/fgs_collapsed_new"

            android:layout_width="12dp"

            android:layout_height="12dp"

            android:scaleType="fitCenter"

packages/SystemUI/src/com/android/systemui/qs/QSFgsManagerFooter.java

+6 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class QSFgsManagerFooter implements View.OnClickListener, 
    private final View mNumberContainer;

    private final TextView mNumberView;

    private final ImageView mDotView;

    private final ImageView mCollapsedDotView;



    @Nullable

    private VisibilityChangedDispatcher.OnVisibilityChangedListener mVisibilityChangedListener;
@@ -75,6 +76,7 @@ public class QSFgsManagerFooter implements View.OnClickListener, 
        mNumberContainer = mRootView.findViewById(R.id.fgs_number_container);

        mNumberView = mRootView.findViewById(R.id.fgs_number);

        mDotView = mRootView.findViewById(R.id.fgs_new);

        mCollapsedDotView = mRootView.findViewById(R.id.fgs_collapsed_new);

        mContext = rootView.getContext();

        mMainExecutor = mainExecutor;

        mExecutor = executor;
@@ -147,8 +149,10 @@ public class QSFgsManagerFooter implements View.OnClickListener, 
            if (mFgsManagerController.shouldUpdateFooterVisibility()) {

                mRootView.setVisibility(mNumPackages > 0

                        && mFgsManagerController.isAvailable() ? View.VISIBLE : View.GONE);

                mDotView.setVisibility(

                        mFgsManagerController.getChangesSinceDialog() ? View.VISIBLE : View.GONE);

                int dotVis =

                        mFgsManagerController.getChangesSinceDialog() ? View.VISIBLE : View.GONE;

                mDotView.setVisibility(dotVis);

                mCollapsedDotView.setVisibility(dotVis);

                if (mVisibilityChangedListener != null) {

                    mVisibilityChangedListener.onVisibilityChanged(mRootView.getVisibility());

                }