PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up before making all setting page render edge-to-edge

Browse Source 
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
This commit is contained in:
Fan Zhang
2019-05-10 14:18:33 -07:00
parent dcf21d4bd6
commit 9db66a562c
7 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -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 {

9
src/com/android/settings/SetupEncryptionInterstitial.java
View File

@@ -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 {
}
}

11
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -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();

3
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -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

3
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -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

3
src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
View File

@@ -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

3
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -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 {