From 48987f65df7825b18bb16d2135d267d090c8a6fb Mon Sep 17 00:00:00 2001 From: Udam Saini Date: Thu, 3 Mar 2016 13:20:18 -0800 Subject: [PATCH] Only adds translucent status bar according to theme values. On SUW screens, we do not want to add a translucent status bar. This also affects ime insets when keyboards are shown. bug:27479424 bug:27063940 Change-Id: Ic339a9d931f6580a9af8deea85ec5e5bb60f6cca --- .../settingslib/drawer/SettingsDrawerActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java index 1c032fac00de8..740b394aedcb8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java @@ -68,16 +68,18 @@ public class SettingsDrawerActivity extends Activity { long startTime = System.currentTimeMillis(); - getWindow().addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - getWindow().addFlags(LayoutParams.FLAG_TRANSLUCENT_STATUS); - requestWindowFeature(Window.FEATURE_NO_TITLE); + TypedArray theme = getTheme().obtainStyledAttributes(android.R.styleable.Theme); + if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) { + getWindow().addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); + getWindow().addFlags(LayoutParams.FLAG_TRANSLUCENT_STATUS); + requestWindowFeature(Window.FEATURE_NO_TITLE); + } super.setContentView(R.layout.settings_with_drawer); mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); if (mDrawerLayout == null) { return; } Toolbar toolbar = (Toolbar) findViewById(R.id.action_bar); - TypedArray theme = getTheme().obtainStyledAttributes(android.R.styleable.Theme); if (theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) { toolbar.setVisibility(View.GONE); mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);