Merge "Hide security footer container (QSBH) in portrait" into sc-dev (d8610fbe) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml

+6 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,11 @@
		systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
		</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:id="@+id/space"
		android:layout_width="0dp"

+10 −0

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

		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
		mBatteryRemainingIcon.setIgnoreTunerUpdates(true);
		@@ -186,6 +190,8 @@ public class QuickStatusBarHeader extends FrameLayout {
		super.onConfigurationChanged(newConfig);
		updateResources();
		setDatePrivacyContainersWidth(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE);
		setSecurityHeaderContainerVisibility(
		newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE);
		}

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

		private void setSecurityHeaderContainerVisibility(boolean landscape) {
		mSecurityHeaderView.setVisibility(landscape ? VISIBLE : GONE);
		}

		private void updateBatteryMode() {
		if (mConfigShowBatteryEstimate && !mHasCenterCutout) {
		mBatteryRemainingIcon.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE);