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

Commit 5956517b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Hide security footer container (QSBH) in portrait" into sc-dev am: d8610fbe 

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

Change-Id: I51e967f6ba229f895cd24de3c961110480566490
parents 10c5abd0 d8610fbe

packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml

+6 −1
Original line number Original line Diff line number Diff line
@@ -47,6 +47,11 @@ 
            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />

    </FrameLayout>

    </FrameLayout>





    <!-- We want this to be centered (to align with notches). In order to do that, the following

         has to hold (in portrait):

         * date_container and privacy_container must have the same width and weight

         * header_text_container must be gone

         -->

    <android.widget.Space

    <android.widget.Space

        android:id="@+id/space"

        android:id="@+id/space"

        android:layout_width="0dp"

        android:layout_width="0dp"

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,10 @@ public class QuickStatusBarHeader extends FrameLayout { 
        mBatteryRemainingIcon = findViewById(R.id.batteryRemainingIcon);

        mBatteryRemainingIcon = findViewById(R.id.batteryRemainingIcon);





        updateResources();

        updateResources();

        Configuration config = mContext.getResources().getConfiguration();

        setDatePrivacyContainersWidth(config.orientation == Configuration.ORIENTATION_LANDSCAPE);

        setSecurityHeaderContainerVisibility(

                config.orientation == Configuration.ORIENTATION_LANDSCAPE);





        // Don't need to worry about tuner settings for this icon

        // Don't need to worry about tuner settings for this icon

        mBatteryRemainingIcon.setIgnoreTunerUpdates(true);

        mBatteryRemainingIcon.setIgnoreTunerUpdates(true);
@@ -186,6 +190,8 @@ public class QuickStatusBarHeader extends FrameLayout { 
        super.onConfigurationChanged(newConfig);

        super.onConfigurationChanged(newConfig);

        updateResources();

        updateResources();

        setDatePrivacyContainersWidth(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE);

        setDatePrivacyContainersWidth(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE);

        setSecurityHeaderContainerVisibility(

                newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE);

    }

    }





    @Override

    @Override
@@ -206,6 +212,10 @@ public class QuickStatusBarHeader extends FrameLayout { 
        mPrivacyContainer.setLayoutParams(lp);

        mPrivacyContainer.setLayoutParams(lp);

    }

    }





    private void setSecurityHeaderContainerVisibility(boolean landscape) {

        mSecurityHeaderView.setVisibility(landscape ? VISIBLE : GONE);

    }



    private void updateBatteryMode() {

    private void updateBatteryMode() {

        if (mConfigShowBatteryEstimate && !mHasCenterCutout) {

        if (mConfigShowBatteryEstimate && !mHasCenterCutout) {

            mBatteryRemainingIcon.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE);

            mBatteryRemainingIcon.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE);