Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f81257a authored Jan 12, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Jan 12, 2021

Merge "Disable toolbar title of screen lock pages"

parents b63f5372 82777ba0

src/com/android/settings/notification/RedactionInterstitial.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,11 @@ public class RedactionInterstitial extends SettingsActivity {
		findViewById(R.id.content_parent).setFitsSystemWindows(false);
		}

		@Override
		protected boolean isToolbarEnabled() {
		return false;
		}

		/**
		* Create an intent for launching RedactionInterstitial.
		*

src/com/android/settings/password/ChooseLockPassword.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,11 @@ public class ChooseLockPassword extends SettingsActivity {
		return false;
		}

		@Override
		protected boolean isToolbarEnabled() {
		return false;
		}

		/* package */ Class<? extends Fragment> getFragmentClass() {
		return ChooseLockPasswordFragment.class;
		}

src/com/android/settings/password/ChooseLockPattern.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,11 @@ public class ChooseLockPattern extends SettingsActivity {
		return super.onKeyDown(keyCode, event);
		}

		@Override
		protected boolean isToolbarEnabled() {
		return false;
		}

		public static class ChooseLockPatternFragment extends InstrumentedFragment
		implements SaveAndFinishWorker.Listener {

src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
		}
		}

		@Override
		protected boolean isToolbarEnabled() {
		return false;
		}

		public void prepareEnterAnimation() {
		getFragment().prepareEnterAnimation();
		}

src/com/android/settings/password/SetupChooseLockPassword.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.os.Bundle;
		import android.util.Log;
		import android.view.View;
		import android.widget.Button;
		import android.widget.LinearLayout;

		import androidx.annotation.Nullable;
		import androidx.fragment.app.Fragment;
		@@ -65,8 +64,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
		@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 SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment