From 268d6b092a48e2bc2df530cd733fc147fb08caf8 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Sat, 7 Dec 2019 16:37:30 -0500
Subject: [PATCH 1/2] Dark theme drop down does not show selected option

a place holder for the summary was updated in commit https://googleplex-android-review.git.corp.google.com/changes/platform%2Fpackages%2Fapps%2FSettings~9818614/revisions/3/files/res%2Fxml%2Fdark_mode_settings.xml/download?parent=1
This change is reverted in this CL

Test: manual
Fixes: 145672617
Change-Id: I41443e7334487e3afac0343333a9ed289d2fe390
---
 res/xml/dark_mode_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/xml/dark_mode_settings.xml b/res/xml/dark_mode_settings.xml
index c3985e67d53..9247a0c3788 100644
--- a/res/xml/dark_mode_settings.xml
+++ b/res/xml/dark_mode_settings.xml
@@ -24,7 +24,7 @@
     <DropDownPreference
         android:key="dark_ui_auto_mode"
         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:entryValues="@array/dark_ui_scheduler_preference_titles"
         settings:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"

From a545a85f9d003cea33e77476175cad0e7ea19de4 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Tue, 16 Jul 2019 17:45:46 +0800
Subject: [PATCH 2/2] Prevent accounts page directly opening in screen pinning
 mode

In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab3546c019d4b79c502f7b8850d36123a5)
---
 .../settings/core/SettingsBaseActivity.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 5ff81d54aa6..6e37b161924 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -17,6 +17,7 @@ package com.android.settings.core;
 
 import android.annotation.LayoutRes;
 import android.annotation.Nullable;
+import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -26,6 +27,7 @@ import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -61,6 +63,10 @@ public class SettingsBaseActivity extends FragmentActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
+            Log.w(TAG, "Devices lock task mode pinned.");
+            finish();
+        }
         final long startTime = System.currentTimeMillis();
         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.
      */