Merge "Fixes back button on action bar on some fragments." into nyc-dev (2b1d00bf) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ import com.android.settings.fingerprint.FingerprintUiHelper;
		/**
		* Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
		*/
		public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFragment
		public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFragment
		implements FingerprintUiHelper.Callback {

		public static final String PACKAGE = "com.android.settings";

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ public class DeviceAdminSettings extends ListFragment {
		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);

		setHasOptionsMenu(true);
		Utils.forceCustomPadding(getListView(), true /* additive padding */);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		*
		* This is the initial screen.
		*/
		public class MasterClear extends InstrumentedFragment {
		public class MasterClear extends OptionsMenuFragment {
		private static final String TAG = "MasterClear";

		private static final int KEYGUARD_REQUEST = 55;

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		*
		* This is the confirmation screen.
		*/
		public class MasterClearConfirm extends InstrumentedFragment {
		public class MasterClearConfirm extends OptionsMenuFragment {

		private View mContentView;
		private boolean mEraseSdCard;

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings;

		import android.os.Bundle;

		/**
		* Base class for a fragment that has the options menu.
		* SettingsPreferenceFragment automatically sets this, but some activities do not use
		* preferences, and we need to call setHasOptionsMenu(true) for the back button on action bar.
		* For preference fragments, use SettingsPreferenceFragment.
		*/
		public abstract class OptionsMenuFragment extends InstrumentedFragment {

		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		setHasOptionsMenu(true);
		}
		}