Disable toolbar title of screen lock pages

After applying collapsing toolbar in the Settings app, the toolbar title
will be shown in every subsetting pages. However some pages in the
security category don't need the title, like set screen lock page and
lock screen page. This CL is to disable these titles through overriding
isToolbarEnabled method.

Bug: 176883575
Test: manual test and visual verified
1) Navigate to Settings -> Security -> Screen lock ->
Pattern/PIN/Password
2) Observe and check if there is a duplicated title.

Change-Id: I6dfa4fbe1b5e2ac3582804ba1e125196f3bdba6c
This commit is contained in:
Mill Chen
2021-01-06 20:48:57 +08:00
parent 14cfd2f2ca
commit 82777ba0c0
5 changed files with 21 additions and 3 deletions

View File

@@ -77,6 +77,11 @@ public class RedactionInterstitial extends SettingsActivity {
findViewById(R.id.content_parent).setFitsSystemWindows(false); findViewById(R.id.content_parent).setFitsSystemWindows(false);
} }
@Override
protected boolean isToolbarEnabled() {
return false;
}
/** /**
* Create an intent for launching RedactionInterstitial. * Create an intent for launching RedactionInterstitial.
* *

View File

@@ -184,6 +184,11 @@ public class ChooseLockPassword extends SettingsActivity {
return false; return false;
} }
@Override
protected boolean isToolbarEnabled() {
return false;
}
/* package */ Class<? extends Fragment> getFragmentClass() { /* package */ Class<? extends Fragment> getFragmentClass() {
return ChooseLockPasswordFragment.class; return ChooseLockPasswordFragment.class;
} }

View File

@@ -194,6 +194,11 @@ public class ChooseLockPattern extends SettingsActivity {
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
} }
@Override
protected boolean isToolbarEnabled() {
return false;
}
public static class ChooseLockPatternFragment extends InstrumentedFragment public static class ChooseLockPatternFragment extends InstrumentedFragment
implements SaveAndFinishWorker.Listener { implements SaveAndFinishWorker.Listener {

View File

@@ -176,6 +176,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
} }
} }
@Override
protected boolean isToolbarEnabled() {
return false;
}
public void prepareEnterAnimation() { public void prepareEnterAnimation() {
getFragment().prepareEnterAnimation(); getFragment().prepareEnterAnimation();
} }

View File

@@ -24,7 +24,6 @@ import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.LinearLayout;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -65,8 +64,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
@Override @Override
protected void onCreate(Bundle savedInstance) { protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance); super.onCreate(savedInstance);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); findViewById(R.id.content_parent).setFitsSystemWindows(false);
layout.setFitsSystemWindows(false);
} }
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment