Snap for 6066307 from 4fd41fe196a402dda3d8c945e970cf69aea2d115 to qt-qpr2-release (9bc6cf2e) · Commits · e / os / android_packages_apps_Settings

res/xml/dark_mode_settings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@
	<DropDownPreference		<DropDownPreference
	android:key="dark_ui_auto_mode"		android:key="dark_ui_auto_mode"
	android:title="@string/dark_ui_auto_mode_title"		android:title="@string/dark_ui_auto_mode_title"
	android:summary="@string/summary_placeholder"		android:summary="%s"
	android:entries="@array/dark_ui_scheduler_preference_titles"		android:entries="@array/dark_ui_scheduler_preference_titles"
	android:entryValues="@array/dark_ui_scheduler_preference_titles"		android:entryValues="@array/dark_ui_scheduler_preference_titles"
	settings:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"		settings:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"

src/com/android/settings/core/SettingsBaseActivity.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@ package com.android.settings.core;

	import android.annotation.LayoutRes;		import android.annotation.LayoutRes;
	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.app.ActivityManager;
	import android.content.BroadcastReceiver;		import android.content.BroadcastReceiver;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	@@ -26,6 +27,7 @@ import android.content.pm.PackageManager;
	import android.content.res.TypedArray;		import android.content.res.TypedArray;
	import android.os.AsyncTask;		import android.os.AsyncTask;
	import android.os.Bundle;		import android.os.Bundle;
			import android.text.TextUtils;
	import android.util.ArraySet;		import android.util.ArraySet;
	import android.util.Log;		import android.util.Log;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	@@ -61,6 +63,10 @@ public class SettingsBaseActivity extends FragmentActivity {
	@Override		@Override
	protected void onCreate(@Nullable Bundle savedInstanceState) {		protected void onCreate(@Nullable Bundle savedInstanceState) {
	super.onCreate(savedInstanceState);		super.onCreate(savedInstanceState);
			if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
			Log.w(TAG, "Devices lock task mode pinned.");
			finish();
			}
	final long startTime = System.currentTimeMillis();		final long startTime = System.currentTimeMillis();
	getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));		getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));

	@@ -148,6 +154,20 @@ public class SettingsBaseActivity extends FragmentActivity {
	}		}
	}		}

			private boolean isLockTaskModePinned() {
			final ActivityManager activityManager =
			getApplicationContext().getSystemService(ActivityManager.class);
			return activityManager.getLockTaskModeState() == ActivityManager.LOCK_TASK_MODE_PINNED;
			}

			private boolean isSettingsRunOnTop() {
			final ActivityManager activityManager =
			getApplicationContext().getSystemService(ActivityManager.class);
			final String taskPkgName = activityManager.getRunningTasks(1 /* maxNum */)
			.get(0 /* index */).baseActivity.getPackageName();
			return TextUtils.equals(getPackageName(), taskPkgName);
			}

	/**		/**
	* @return whether or not the enabled state actually changed.		* @return whether or not the enabled state actually changed.
	*/		*/