From 9db66a562cab4181e5073f011bada2189920e8a0 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 10 May 2019 14:18:33 -0700 Subject: [PATCH] Clean up before making all setting page render edge-to-edge These classes are casting view to LinearLayout unnecessarily. Later we might change the root view away from LinearLayout. The cast will cause crash. Bug: 132182711 Test: go through SUW. Change-Id: Iea31882f8edea0c87ef8e95b4da9b6bffa8ea7d0 --- src/com/android/settings/EncryptionInterstitial.java | 3 +-- .../android/settings/SetupEncryptionInterstitial.java | 9 --------- .../settings/notification/RedactionInterstitial.java | 11 +++++------ .../android/settings/password/ChooseLockPassword.java | 3 +-- .../android/settings/password/ChooseLockPattern.java | 3 +-- .../password/ConfirmDeviceCredentialBaseActivity.java | 3 +-- .../settings/password/SetupChooseLockGeneric.java | 3 +-- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index 515b1b0525a..c132c89dc39 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -84,8 +84,7 @@ public class EncryptionInterstitial extends SettingsActivity { @Override protected void onCreate(Bundle savedInstance) { super.onCreate(savedInstance); - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); + findViewById(R.id.content_parent).setFitsSystemWindows(false); } public static class EncryptionInterstitialFragment extends InstrumentedFragment { diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java index 989cc2b12cc..d9e265f9912 100644 --- a/src/com/android/settings/SetupEncryptionInterstitial.java +++ b/src/com/android/settings/SetupEncryptionInterstitial.java @@ -18,8 +18,6 @@ package com.android.settings; import android.content.Context; import android.content.Intent; -import android.os.Bundle; -import android.widget.LinearLayout; /** * Setup Wizard's version of EncryptionInterstitial screen. It inherits the logic and basic @@ -53,13 +51,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial { return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName); } - @Override - protected void onCreate(Bundle savedInstance) { - super.onCreate(savedInstance); - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); - } - public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment { } } diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index 74ccf591313..14f99f38b3d 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -33,7 +33,6 @@ import android.provider.Settings; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; @@ -74,12 +73,12 @@ public class RedactionInterstitial extends SettingsActivity { @Override protected void onCreate(Bundle savedInstance) { super.onCreate(savedInstance); - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); + findViewById(R.id.content_parent).setFitsSystemWindows(false); } /** * Create an intent for launching RedactionInterstitial. + * * @return An intent to launch the activity is if is available, @null if the activity is not * available to be launched. */ @@ -87,8 +86,8 @@ public class RedactionInterstitial extends SettingsActivity { return new Intent(ctx, RedactionInterstitial.class) .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, UserManager.get(ctx).isManagedProfile(userId) - ? R.string.lock_screen_notifications_interstitial_title_profile - : R.string.lock_screen_notifications_interstitial_title) + ? R.string.lock_screen_notifications_interstitial_title_profile + : R.string.lock_screen_notifications_interstitial_title) .putExtra(Intent.EXTRA_USER_ID, userId); } @@ -160,7 +159,7 @@ public class RedactionInterstitial extends SettingsActivity { checkNotificationFeaturesAndSetDisabled(mShowAllButton, KEYGUARD_DISABLE_SECURE_NOTIFICATIONS | - KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS); + KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS); checkNotificationFeaturesAndSetDisabled(mRedactSensitiveButton, KEYGUARD_DISABLE_SECURE_NOTIFICATIONS); loadFromSettings(); diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 8677e220356..639dd6b63be 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -175,8 +175,7 @@ public class ChooseLockPassword extends SettingsActivity { } setTitle(msg); - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); + findViewById(R.id.content_parent).setFitsSystemWindows(false); } public static class ChooseLockPasswordFragment extends InstrumentedFragment diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index dd5e674bc1f..5de4e3ad149 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -163,8 +163,7 @@ public class ChooseLockPattern extends SettingsActivity { } setTitle(msg); - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); + findViewById(R.id.content_parent).setFitsSystemWindows(false); } @Override diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java index aa40d27d2a8..998b3fcdd18 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java @@ -96,8 +96,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) { // Prevent the content parent from consuming the window insets because GlifLayout uses // it to show the status bar background. - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); + findViewById(R.id.content_parent).setFitsSystemWindows(false); } getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); mIsKeyguardLocked = savedState == null diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 8155a72e7df..9a165297942 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -93,8 +93,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { } } - LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); - layout.setFitsSystemWindows(false); + findViewById(R.id.content_parent).setFitsSystemWindows(false); } public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {