From 77f3973d975251ec10b81954e39e6b8ce675957c Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 18 May 2018 17:09:07 -0400
Subject: [PATCH 01/13] Update DND strings

Test: manual
Bug: 79525632
Change-Id: Ia6106d03499fa546df51dc80f086c7cd684acad4
---
 res/values/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f617df17217..ed2b341f5e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7253,15 +7253,15 @@
     <!-- Do not disturb: restrict notifications title [CHAR LIMIT=60] -->
     <string name="zen_mode_restrict_notifications_title">Notifications</string>
     <!-- Do not disturb: Mute notifications option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_mute">Show notifications silently</string>
+    <string name="zen_mode_restrict_notifications_mute">No sound from notifications</string>
     <!-- Do not disturb:Mute notifications summary [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_restrict_notifications_mute_summary">Notifications will be muted</string>
+    <string name="zen_mode_restrict_notifications_mute_summary">You will see notifications on your screen</string>
     <!-- Do not disturb:Mute notifications footer [CHAR LIMIT=NONE] -->
     <string name="zen_mode_restrict_notifications_mute_footer">When notifications arrive, your phone won\u2019t make a sound or vibrate.</string>
     <!-- Do not disturb: Hide notifications option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_hide">Hide notifications</string>
+    <string name="zen_mode_restrict_notifications_hide">No visuals or sound from notifications</string>
     <!-- Do not disturb: Hide notifications summary [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_restrict_notifications_hide_summary">You won\u2019t see new or existing notifications</string>
+    <string name="zen_mode_restrict_notifications_hide_summary">You won\u2019t see or hear notifications</string>
     <!-- Do not disturb: Hide notifications footer [CHAR LIMIT=NONE] -->
     <string name="zen_mode_restrict_notifications_hide_footer">Your phone won\u2019t show new or existing notifications, and won\u2019t make a sound or vibrate. Notifications won\u2019t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear.</string>
     <!-- Do not disturb: Custom settings option [CHAR LIMIT=60] -->
@@ -7271,11 +7271,11 @@
     <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
     <string name="zen_mode_restrict_notifications_disable_custom">Remove custom setting</string>
     <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_summary_muted">Will appear</string>
+    <string name="zen_mode_restrict_notifications_summary_muted">No sound from notifications</string>
     <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
     <string name="zen_mode_restrict_notifications_summary_custom">Partially hidden</string>
-    <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_summary_hidden">Hidden</string>
+    <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=100] -->
+    <string name="zen_mode_restrict_notifications_summary_hidden">No visuals or sound from notifications</string>
 
     <!-- Do not disturb: what to block title [CHAR LIMIT = 60] -->
     <string name="zen_mode_what_to_block_title">Custom restrictions</string>
@@ -7418,7 +7418,7 @@
     <string name="zen_onboarding_settings">Settings</string>
 
     <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
-    <string name="zen_onboarding_new_setting_title">No visuals or sounds from notifications</string>
+    <string name="zen_onboarding_new_setting_title">No visuals or sound from notifications</string>
     <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
     <string name="zen_onboarding_current_setting_title">No sound from notifications</string>
     <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->
@@ -9919,7 +9919,7 @@
     <string name="zen_suggestion_title">Update Do Not Disturb</string>
 
     <!-- Summary label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
-    <string name="zen_suggestion_summary">Hide notifications to stay focused</string>
+    <string name="zen_suggestion_summary">Pause notifications to stay focused</string>
 
     <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
     <string name="new_device_suggestion_title">What\'s new and exciting?</string>

From f6d54bc6c52d88270d599544f15f716f492e7ca2 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 18 May 2018 18:02:14 -0400
Subject: [PATCH 02/13] Don't give onboarding dialog a fixed width

Test: visual inspection (display and font largest)
Change-Id: Ia81cfa41c125d088d95db2e29f83248dc6819396
Fixes: 79960996
---
 res/layout/zen_onboarding.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/zen_onboarding.xml b/res/layout/zen_onboarding.xml
index 82951bd264d..33cdbdd35fd 100644
--- a/res/layout/zen_onboarding.xml
+++ b/res/layout/zen_onboarding.xml
@@ -16,8 +16,8 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="320dp"
-    android:layout_height="wrap_content" >
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <RelativeLayout
         android:id="@+id/zen_onboarding_choices"

From 7f1345c3cd8cb894eddd0245c03a3ae08372a528 Mon Sep 17 00:00:00 2001
From: hughchen <hughchen@google.com>
Date: Wed, 9 May 2018 14:33:52 +0800
Subject: [PATCH 03/13] Using static method to get summary resource id

* Using getConnectedDevicesSummaryResourceId() to get the resource id to shown the summary.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I268de4d989fe01eff463a5ec1c0a174e094e56c0
---
 .../ConnectedDeviceDashboardFragment.java            | 12 ++----------
 .../ConnectedDeviceDashboardFragmentTest.java        |  1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 26ff930558a..c57c0b595f7 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -72,25 +72,17 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
-        private final NfcPreferenceController mNfcPreferenceController;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
-            mNfcPreferenceController = new NfcPreferenceController(context);
         }
 
-
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                if (mNfcPreferenceController.isAvailable()) {
-                    mSummaryLoader.setSummary(this,
-                            mContext.getString(R.string.connected_devices_dashboard_summary));
-                } else {
-                    mSummaryLoader.setSummary(this, mContext.getString(
-                            R.string.connected_devices_dashboard_no_nfc_summary));
-                }
+                mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.
+                        getConnectedDevicesSummaryResourceId(mContext)));
             }
         }
     }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 90641792639..cea258d67ce 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;

From 988dc9fbe6728196a6a47c159308db7f2a97034d Mon Sep 17 00:00:00 2001
From: ryanywlin <ryanywlin@google.com>
Date: Sat, 19 May 2018 07:34:52 +0800
Subject: [PATCH 04/13] Move getLocalBtManager into FutureTask

Utils.getLocalBtManager in constructor violate StrictMode
ThreadPolicy, move it into FutureTask.

Bug: 79985175
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: I0a14be18e4766245e7d165239d47ab54fa5e4acb
---
 .../AudioSwitchPreferenceController.java      | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index 62f345370a7..b0ee649b1ae 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -41,6 +41,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
+import android.util.Log;
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.Utils;
@@ -59,6 +60,8 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
 
 /**
  * Abstract class for audio switcher controller to notify subclass
@@ -70,21 +73,22 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
         implements Preference.OnPreferenceChangeListener, BluetoothCallback,
         LifecycleObserver, OnStart, OnStop {
 
+    private static final String TAG = "AudioSwitchPreferenceController";
     private static final int INVALID_INDEX = -1;
 
     protected final List<BluetoothDevice> mConnectedDevices;
     protected final AudioManager mAudioManager;
     protected final MediaRouter mMediaRouter;
-    protected final LocalBluetoothProfileManager mProfileManager;
     protected int mSelectedIndex;
     protected Preference mPreference;
+    protected LocalBluetoothProfileManager mProfileManager;
     protected AudioSwitchCallback mAudioSwitchPreferenceCallback;
 
     private final AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback;
-    private final LocalBluetoothManager mLocalBluetoothManager;
     private final MediaRouterCallback mMediaRouterCallback;
     private final WiredHeadsetBroadcastReceiver mReceiver;
     private final Handler mHandler;
+    private LocalBluetoothManager mLocalBluetoothManager;
 
     public interface AudioSwitchCallback {
         void onPreferenceDataChanged(ListPreference preference);
@@ -94,14 +98,23 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
         super(context, preferenceKey);
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         mMediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
-        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
-        mLocalBluetoothManager.setForegroundActivity(context);
-        mProfileManager = mLocalBluetoothManager.getProfileManager();
         mHandler = new Handler(Looper.getMainLooper());
         mAudioManagerAudioDeviceCallback = new AudioManagerAudioDeviceCallback();
         mReceiver = new WiredHeadsetBroadcastReceiver();
         mMediaRouterCallback = new MediaRouterCallback();
         mConnectedDevices = new ArrayList<>();
+        final FutureTask<LocalBluetoothManager> localBtManagerFutureTask = new FutureTask<>(
+                // Avoid StrictMode ThreadPolicy violation
+                () -> Utils.getLocalBtManager(mContext));
+        try {
+            localBtManagerFutureTask.run();
+            mLocalBluetoothManager = localBtManagerFutureTask.get();
+        } catch (InterruptedException | ExecutionException e) {
+            Log.w(TAG, "Error getting LocalBluetoothManager.", e);
+            return;
+        }
+        mLocalBluetoothManager.setForegroundActivity(mContext);
+        mProfileManager = mLocalBluetoothManager.getProfileManager();
     }
 
     /**

From 77b59860322be8a7afb3015003de84b6ec6855fa Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 21 May 2018 13:27:09 -0400
Subject: [PATCH 05/13] DO NOT MERGE styleActionBar when updating header

If the activity has started, style the actionBar when the
header is being updated

Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Bug: 79983080
---
 .../notification/HeaderPreferenceController.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java
index c6f6a80621f..0a4cca1934f 100644
--- a/src/com/android/settings/notification/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/HeaderPreferenceController.java
@@ -18,6 +18,7 @@ package com.android.settings.notification;
 
 import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
 
+import android.app.Activity;
 import android.arch.lifecycle.LifecycleObserver;
 import android.arch.lifecycle.OnLifecycleEvent;
 import android.content.Context;
@@ -26,6 +27,7 @@ import android.support.v7.preference.Preference;
 import android.text.BidiFormatter;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.util.Slog;
 import android.view.View;
 
 import com.android.settings.R;
@@ -33,15 +35,13 @@ import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-
-import java.util.Objects;
 
 public class HeaderPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver {
 
     private final PreferenceFragment mFragment;
     private EntityHeaderController mHeaderController;
+    private boolean mStarted = false;
 
     public HeaderPreferenceController(Context context, PreferenceFragment fragment) {
         super(context, null);
@@ -61,6 +61,13 @@ public class HeaderPreferenceController extends NotificationPreferenceController
     @Override
     public void updateState(Preference preference) {
         if (mAppRow != null && mFragment != null) {
+
+            Activity activity = null;
+            if (mStarted) {
+                // don't call done on an activity if it hasn't started yet
+                activity = mFragment.getActivity();
+            }
+
             LayoutPreference pref = (LayoutPreference) preference;
             mHeaderController = EntityHeaderController.newInstance(
                     mFragment.getActivity(), mFragment, pref.findViewById(R.id.entity_header));
@@ -72,7 +79,7 @@ public class HeaderPreferenceController extends NotificationPreferenceController
                     .setButtonActions(EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
                             EntityHeaderController.ActionType.ACTION_NONE)
                     .setHasAppInfoLink(true)
-                    .done(null, mContext);
+                    .done(activity, mContext);
             pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
         }
     }
@@ -108,6 +115,7 @@ public class HeaderPreferenceController extends NotificationPreferenceController
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     public void onStart() {
+        mStarted = true;
         if (mHeaderController != null) {
             mHeaderController.styleActionBar(mFragment.getActivity());
         }

From 6394a1425cf05901a7cc2fddc5431c5c4f542316 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Mon, 21 May 2018 13:36:45 -0700
Subject: [PATCH 06/13] Change Night Display slice title to "NightDisplay"

Fixes: 80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f
---
 res/xml/night_display_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index 7b00ea02567..d83fcc6d3cb 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -45,7 +45,7 @@
 
     <com.android.settings.applications.LayoutPreference
         android:key="night_display_activated"
-        android:title="@string/night_display_status_title"
+        android:title="@string/night_display_title"
         android:selectable="false"
         android:layout="@layout/night_display_activation_button"
         settings:keywords="@string/keywords_display_night_display"

From 3ab53bbd7b6763c3a0f50b7b461c416d99568b1a Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 21 May 2018 12:07:28 -0700
Subject: [PATCH 07/13] Misc GAR fixes

- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual
---
 res/drawable/selectable_card_grey.xml         | 22 -------------------
 res/layout/battery_header.xml                 |  1 -
 res/layout/data_usage_summary_preference.xml  |  3 +--
 res/values/styles.xml                         |  2 +-
 .../widget/EntityHeaderController.java        |  2 +-
 .../shadow/SettingsShadowResources.java       |  3 ---
 .../shadow/SettingsShadowResourcesImpl.java   |  2 --
 7 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 res/drawable/selectable_card_grey.xml

diff --git a/res/drawable/selectable_card_grey.xml b/res/drawable/selectable_card_grey.xml
deleted file mode 100644
index 225e72fcff1..00000000000
--- a/res/drawable/selectable_card_grey.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="?android:attr/colorSecondary"/>
-</ripple>
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index db90e2e0fc8..df45d15fd6d 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -24,7 +24,6 @@
     android:orientation="horizontal"
     android:paddingTop="24dp"
     android:paddingBottom="24dp"
-    android:background="@drawable/selectable_card_grey"
     style="@style/EntityHeader">
 
     <LinearLayout
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 6af159a01ba..6617ac9cacf 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -23,7 +23,6 @@
     android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical"
-    android:background="@drawable/selectable_card_grey"
     android:selectable="false"
     style="@style/EntityHeader">
 
@@ -31,7 +30,7 @@
         android:id="@+id/usage_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="?android:attr/textColorPrimary"
         android:text="@string/data_usage_title" />
 
     <com.android.settings.datausage.MeasurableLinearLayout
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 805261655a4..f82d0e5e854 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -412,7 +412,7 @@
     </style>
 
     <style name="EntityHeader">
-        <item name="android:background">?android:attr/colorSecondary</item>
+        <item name="android:background">?android:attr/colorPrimary</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingStart">16dp</item>
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 6d67eb49039..bb8f00ceb0a 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -318,7 +318,7 @@ public class EntityHeaderController {
             return this;
         }
         actionBar.setBackgroundDrawable(
-                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
+                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimary)));
         actionBar.setElevation(0);
         if (mRecyclerView != null && mLifecycle != null) {
             ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index 768e6eac663..f06d64b32e8 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -1,7 +1,6 @@
 package com.android.settings.testutils.shadow;
 
 import static android.util.TypedValue.TYPE_REFERENCE;
-
 import static org.robolectric.RuntimeEnvironment.application;
 import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.shadow.api.Shadow.directlyOn;
@@ -122,8 +121,6 @@ public class SettingsShadowResources extends ShadowResources {
             id = R.drawable.ic_settings_wireless;
         } else if (id == R.drawable.app_filter_spinner_background) {
             id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
         }
         return super.loadDrawable(value, id, theme);
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
index 3fb8e2decb5..e9c7b5855d2 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
@@ -50,8 +50,6 @@ public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
             id = R.drawable.ic_settings_wireless;
         } else if (id == R.drawable.app_filter_spinner_background) {
             id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
         } else if (id == R.drawable.color_bar_progress
                 || id == R.drawable.ring_progress) {
             // color_bar_progress and ring_progress use hidden resources, so just use the regular

From 32acddc83e3b070c37765724970dfa076d776062 Mon Sep 17 00:00:00 2001
From: Antony Sargent <asargent@google.com>
Date: Mon, 21 May 2018 16:42:11 -0700
Subject: [PATCH 08/13] Update music, notifications, device information, and
 movies icons

Also delete duplicated ic_settings_notifications.xml and point existing
usages to ic_notifications.xml

Bug: 77982107
Test: manual
Change-Id: Ia7896598c6334aa97faf392b17e6bc3c17d58599
---
 AndroidManifest.xml                           |  6 ++---
 res/drawable/ic_local_movies.xml              |  2 +-
 res/drawable/ic_media_stream.xml              |  2 +-
 res/drawable/ic_notifications.xml             |  7 ++++--
 .../ic_perm_device_information_green_24dp.xml |  9 +++++--
 .../ic_perm_device_information_red_24dp.xml   |  9 +++++--
 res/drawable/ic_settings_notifications.xml    | 25 -------------------
 res/drawable/ic_suggested_notifications.xml   | 13 ++++++----
 8 files changed, 32 insertions(+), 41 deletions(-)
 delete mode 100644 res/drawable/ic_settings_notifications.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 74a18eab61f..27132165b91 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -715,7 +715,7 @@
         <activity
             android:name="Settings$ZenModeSettingsActivity"
             android:label="@string/zen_mode_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:exported="true"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
@@ -762,7 +762,7 @@
         <activity
             android:name=".notification.ZenOnboardingActivity"
             android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
             android:exported="true"
             android:taskAffinity="com.android.settings"
@@ -775,7 +775,7 @@
         <activity
             android:name="Settings$ZenModeAutomationSettingsActivity"
             android:label="@string/zen_mode_automation_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:exported="true"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$ZenModeSettingsActivity">
diff --git a/res/drawable/ic_local_movies.xml b/res/drawable/ic_local_movies.xml
index 99977237452..be9d122cb81 100644
--- a/res/drawable/ic_local_movies.xml
+++ b/res/drawable/ic_local_movies.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M18,3v2h-2V3H8v2H6V3H5C4.45,3 4,3.45 4,4v16c0,0.55 0.45,1 1,1h1v-2h2v2h8v-2h2v2h1c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1H18zM8,17H6v-2h2V17zM8,13H6v-2h2V13zM8,9H6V7h2V9zM18,17h-2v-2h2V17zM18,13h-2v-2h2V13zM18,9h-2V7h2V9z"/>
+        android:pathData="M20,4h-3l2,4h-3l-2,-4h-2l2,4h-3L9,4H7l2,4H6L4,4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18L4,18v-8h16V18z"/>
 </vector>
diff --git a/res/drawable/ic_media_stream.xml b/res/drawable/ic_media_stream.xml
index 4eb78bcf35b..122e9c58609 100644
--- a/res/drawable/ic_media_stream.xml
+++ b/res/drawable/ic_media_stream.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/>
+        android:pathData="M12,3l0.01,10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55C7.79,13 6,14.79 6,17c0,2.21 1.79,4 4.01,4S14,19.21 14,17V7h4V3H12zM10.01,19c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C12.01,18.1 11.11,19 10.01,19z"/>
 </vector>
diff --git a/res/drawable/ic_notifications.xml b/res/drawable/ic_notifications.xml
index ec2422dbd14..20e9e5d8be4 100644
--- a/res/drawable/ic_notifications.xml
+++ b/res/drawable/ic_notifications.xml
@@ -20,6 +20,9 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
 </vector>
diff --git a/res/drawable/ic_perm_device_information_green_24dp.xml b/res/drawable/ic_perm_device_information_green_24dp.xml
index a2b9354dfbc..e309b404e9c 100644
--- a/res/drawable/ic_perm_device_information_green_24dp.xml
+++ b/res/drawable/ic_perm_device_information_green_24dp.xml
@@ -21,6 +21,11 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#0F9D58"
-        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,
-        1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
+        android:pathData="M11,7h2v2h-2z"/>
+    <path
+        android:fillColor="#0F9D58"
+        android:pathData="M11,11h2v6h-2z"/>
+    <path
+        android:fillColor="#0F9D58"
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>
 </vector>
diff --git a/res/drawable/ic_perm_device_information_red_24dp.xml b/res/drawable/ic_perm_device_information_red_24dp.xml
index 135e212411a..d375c0bc603 100644
--- a/res/drawable/ic_perm_device_information_red_24dp.xml
+++ b/res/drawable/ic_perm_device_information_red_24dp.xml
@@ -22,6 +22,11 @@
         android:tint="?android:attr/colorError">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,
-        1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
+        android:pathData="M11,7h2v2h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,11h2v6h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>
 </vector>
diff --git a/res/drawable/ic_settings_notifications.xml b/res/drawable/ic_settings_notifications.xml
deleted file mode 100644
index 2b49afe39b6..00000000000
--- a/res/drawable/ic_settings_notifications.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0c0.0,1.0 0.89,2.0 2.0,2.0zm6.0,-6.0l0.0,-5.0c0.0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4.0c0.0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.0,0.67 -1.5,1.5l0.0,0.68C7.63,5.36 6.0,7.92 6.0,11.0l0.0,5.0l-2.0,2.0l0.0,1.0l16.0,0.0l0.0,-1.0l-2.0,-2.0z"/>
-</vector>
diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml
index 5a8f0e94342..d15d13a8c20 100644
--- a/res/drawable/ic_suggested_notifications.xml
+++ b/res/drawable/ic_suggested_notifications.xml
@@ -14,11 +14,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/suw_color_accent_light"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4a2,2 0,0 0,2 2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2.15,2.15a0.5,0.5 0,0 0,0.35 0.85h15.6c0.45,0 0.67,-0.54 0.35,-0.85L18,16z"/>
+        android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
+    <path
+        android:fillColor="@color/suw_color_accent_light"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
 </vector>

From 95d067760becaa38e96cb806c4d29d9fa89d7f63 Mon Sep 17 00:00:00 2001
From: Lei Yu <jackqdyulei@google.com>
Date: Fri, 18 May 2018 14:12:55 -0700
Subject: [PATCH 09/13] Add action log in "Restrict app page".

This CL adds confirmation dialog in "Restrict app page". By go through
BatteryTipDialogFragment, it will find the correct action, in which
we already have log:
1. RestrictAppAction
2. UnRestrictAppAction

Bug: 79992590
Test: RunSettingsRoboTests
Change-Id: I179fbd17a012528fdfacf42e4a93943eaefff23d
Merged-In: I179fbd17a012528fdfacf42e4a93943eaefff23d
---
 .../fuelgauge/RestrictedAppDetails.java       | 54 +++++++++++---
 .../batterytip/tips/UnrestrictAppTip.java     |  4 +
 .../fuelgauge/RestrictedAppDetailsTest.java   | 74 +++++++++++++++++--
 3 files changed, 116 insertions(+), 16 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index 5a7f4bad8bd..2aa0efb4d62 100644
--- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.fuelgauge;
 
-import android.app.AppOpsManager;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -31,12 +29,16 @@ import android.util.IconDrawableFactory;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
+import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 import com.android.settings.widget.AppCheckBoxPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.FooterPreferenceMixin;
@@ -46,7 +48,8 @@ import java.util.List;
 /**
  * Fragment to show a list of anomaly apps, where user could handle these anomalies
  */
-public class RestrictedAppDetails extends DashboardFragment {
+public class RestrictedAppDetails extends DashboardFragment implements
+        BatteryTipPreferenceController.BatteryTipListener {
 
     public static final String TAG = "RestrictedAppDetails";
 
@@ -145,12 +148,14 @@ public class RestrictedAppDetails extends DashboardFragment {
                         Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager,
                                 appInfo.packageName,
                                 UserHandle.getUserId(appInfo.uid)));
+                checkBoxPreference.setKey(getKeyFromAppInfo(appInfo));
                 checkBoxPreference.setOnPreferenceChangeListener((pref, value) -> {
-                    // change the toggle
-                    final int mode = (Boolean) value ? AppOpsManager.MODE_IGNORED
-                            : AppOpsManager.MODE_ALLOWED;
-                    mBatteryUtils.setForceAppStandby(appInfo.uid, appInfo.packageName, mode);
-                    return true;
+                    final BatteryTipDialogFragment fragment = createDialogFragment(appInfo,
+                            (Boolean) value);
+                    fragment.setTargetFragment(this, 0 /* requestCode */);
+                    fragment.show(getFragmentManager(), TAG);
+
+                    return false;
                 });
                 mRestrictedAppListGroup.addPreference(checkBoxPreference);
             } catch (PackageManager.NameNotFoundException e) {
@@ -159,4 +164,35 @@ public class RestrictedAppDetails extends DashboardFragment {
         }
     }
 
+    @Override
+    public void onBatteryTipHandled(BatteryTip batteryTip) {
+        final AppInfo appInfo;
+        final boolean isRestricted = batteryTip instanceof RestrictAppTip;
+        if (isRestricted) {
+            appInfo = ((RestrictAppTip) batteryTip).getRestrictAppList().get(0);
+        } else {
+            appInfo = ((UnrestrictAppTip) batteryTip).getUnrestrictAppInfo();
+        }
+
+        CheckBoxPreference preference = (CheckBoxPreference) mRestrictedAppListGroup
+                .findPreference(getKeyFromAppInfo(appInfo));
+        if (preference != null) {
+            preference.setChecked(isRestricted);
+        }
+    }
+
+    @VisibleForTesting
+    BatteryTipDialogFragment createDialogFragment(AppInfo appInfo, boolean toRestrict) {
+        final BatteryTip batteryTip = toRestrict
+                ? new RestrictAppTip(BatteryTip.StateType.NEW, appInfo)
+                : new UnrestrictAppTip(BatteryTip.StateType.NEW, appInfo);
+
+        return BatteryTipDialogFragment.newInstance(
+                batteryTip, getMetricsCategory());
+    }
+
+    @VisibleForTesting
+    String getKeyFromAppInfo(AppInfo appInfo) {
+        return appInfo.uid + "," + appInfo.packageName;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
index 93de9b77128..18ab3c2c054 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
@@ -72,6 +72,10 @@ public class UnrestrictAppTip extends BatteryTip {
         // Do nothing
     }
 
+    public AppInfo getUnrestrictAppInfo() {
+        return mAppInfo;
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
index 04ba246319d..dc71ed58e0c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -21,7 +21,9 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -38,6 +40,11 @@ import android.widget.CheckBox;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
+import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,13 +53,15 @@ import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
+import org.robolectric.util.FragmentTestUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsRobolectricTestRunner.class)
 public class RestrictedAppDetailsTest {
 
     private static final String PACKAGE_NAME = "com.android.app";
@@ -60,20 +69,21 @@ public class RestrictedAppDetailsTest {
     private static final int UID = UserHandle.getUid(USER_ID, 234);
     private static final String APP_NAME = "app";
 
+
     @Mock
     private PackageManager mPackageManager;
     @Mock
     private ApplicationInfo mApplicationInfo;
     @Mock
     private IconDrawableFactory mIconDrawableFactory;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceManager mPreferenceManager;
     @Mock
     private InstrumentedPreferenceFragment mFragment;
+    private PreferenceManager mPreferenceManager;
     private RestrictedAppDetails mRestrictedAppDetails;
     private Context mContext;
     private AppInfo mAppInfo;
     private Intent mIntent;
+    private CheckBoxPreference mCheckBoxPreference;
 
     @Before
     public void setUp() {
@@ -86,8 +96,9 @@ public class RestrictedAppDetailsTest {
                 .setUid(UID)
                 .build();
 
+        mPreferenceManager = new PreferenceManager(mContext);
+
         doReturn(mPreferenceManager).when(mRestrictedAppDetails).getPreferenceManager();
-        doReturn(mContext).when(mPreferenceManager).getContext();
         doReturn(mContext).when(mFragment).getContext();
         mRestrictedAppDetails.mPackageManager = mPackageManager;
         mRestrictedAppDetails.mIconDrawableFactory = mIconDrawableFactory;
@@ -97,10 +108,13 @@ public class RestrictedAppDetailsTest {
         mRestrictedAppDetails.mBatteryUtils = spy(new BatteryUtils(mContext));
         doReturn(mPreferenceManager).when(
                 mRestrictedAppDetails.mRestrictedAppListGroup).getPreferenceManager();
+
+        mCheckBoxPreference = new CheckBoxPreference(mContext);
+        mCheckBoxPreference.setKey(mRestrictedAppDetails.getKeyFromAppInfo(mAppInfo));
     }
 
     @Test
-    public void testRefreshUi_displayPreference() throws Exception {
+    public void refreshUi_displayPreference() throws Exception {
         doReturn(mApplicationInfo).when(mPackageManager)
                 .getApplicationInfoAsUser(PACKAGE_NAME, 0, USER_ID);
         doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
@@ -117,7 +131,7 @@ public class RestrictedAppDetailsTest {
     }
 
     @Test
-    public void testStartRestrictedAppDetails_startWithCorrectData() {
+    public void startRestrictedAppDetails_startWithCorrectData() {
         final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
         doAnswer(invocation -> {
             // Get the intent in which it has the app info bundle
@@ -135,4 +149,50 @@ public class RestrictedAppDetailsTest {
                 RestrictedAppDetails.EXTRA_APP_INFO_LIST);
         assertThat(appInfos).containsExactly(mAppInfo);
     }
+
+    @Test
+    public void createDialogFragment_toRestrict_createRestrictDialog() {
+        final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
+                mAppInfo, true);
+
+        FragmentTestUtil.startFragment(dialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+        assertThat(shadowDialog.getTitle()).isEqualTo("Restrict app?");
+    }
+
+    @Test
+    public void createDialogFragment_toUnrestrict_createUnrestrictDialog() {
+        final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
+                mAppInfo, false);
+
+        FragmentTestUtil.startFragment(dialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+        assertThat(shadowDialog.getTitle()).isEqualTo("Remove restriction?");
+    }
+
+    @Test
+    public void onBatteryTipHandled_restrict_setChecked() {
+        final RestrictAppTip restrictAppTip = new RestrictAppTip(BatteryTip.StateType.NEW,
+                mAppInfo);
+        mRestrictedAppDetails.mRestrictedAppListGroup.addPreference(mCheckBoxPreference);
+
+        mRestrictedAppDetails.onBatteryTipHandled(restrictAppTip);
+
+        assertThat(mCheckBoxPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onBatteryTipHandled_unrestrict_setUnchecked() {
+        final UnrestrictAppTip unrestrictAppTip = new UnrestrictAppTip(BatteryTip.StateType.NEW,
+                mAppInfo);
+        mRestrictedAppDetails.mRestrictedAppListGroup.addPreference(mCheckBoxPreference);
+
+        mRestrictedAppDetails.onBatteryTipHandled(unrestrictAppTip);
+
+        assertThat(mCheckBoxPreference.isChecked()).isFalse();
+    }
 }

From a47e64829d9c58f4a2816fcbb931c9423cef7718 Mon Sep 17 00:00:00 2001
From: hughchen <hughchen@google.com>
Date: Wed, 16 May 2018 17:12:29 +0800
Subject: [PATCH 10/13] Dynamically showing "driving mode"

Dynamically showing "driving mode" in "Connection preferences" summary.
In cl/196700988, when driving mode is available/not available will using
Settings.System to set flag.
Example :
driving mode is available : Settings.System.putInt(mContentResolver,
DRIVING_MODE_SETTINGS_ENABLED, 1)
driving mode is not available : Settings.System.putInt(mContentResolver,
DRIVING_MODE_SETTINGS_ENABLED, 0);

This CL using Settings.System to get driving mode state that used to dynamically
showing "driving mode"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I702fa4fbc752c7b470184cf58f2e604f9f28c057
Merged-In: I702fa4fbc752c7b470184cf58f2e604f9f28c057
---
 .../AdvancedConnectedDeviceController.java    | 13 ++++++--
 ...AdvancedConnectedDeviceControllerTest.java | 32 ++++++++++++++-----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
index e6139bac5bb..eb93eb178eb 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
@@ -16,6 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import android.content.Context;
+import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
@@ -26,6 +27,9 @@ import com.android.settings.nfc.NfcPreferenceController;
  */
 public class AdvancedConnectedDeviceController extends BasePreferenceController {
 
+    private static final String DRIVING_MODE_SETTINGS_ENABLED =
+            "gearhead:driving_mode_settings_enabled";
+
     public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
@@ -47,10 +51,15 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
     public static int getConnectedDevicesSummaryResourceId(Context context) {
         final NfcPreferenceController nfcPreferenceController =
                 new NfcPreferenceController(context);
-        final boolean isDrivingModeAvailable = false;
 
         return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
-                isDrivingModeAvailable);
+                isDrivingModeAvailable(context));
+    }
+
+    @VisibleForTesting
+    static boolean isDrivingModeAvailable(Context context) {
+        return Settings.System.
+                getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1;
     }
 
     @VisibleForTesting
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
index 84588fd29d9..ceea81eae8e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
@@ -17,7 +17,9 @@ package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 
+import android.content.ContentResolver;
 import android.content.Context;
+import android.provider.Settings;
 import com.android.settings.R;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,16 +41,20 @@ import static org.robolectric.Shadows.shadowOf;
 public class AdvancedConnectedDeviceControllerTest {
 
     private static final String KEY = "test_key";
+    private static final String DRIVING_MODE_SETTINGS_ENABLED =
+            "gearhead:driving_mode_settings_enabled";
 
     private Context mContext;
     private NfcPreferenceController mNfcController;
     private ShadowNfcAdapter mShadowNfcAdapter;
+    private ContentResolver mContentResolver;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(RuntimeEnvironment.application);
+        mContentResolver = mContext.getContentResolver();
         mNfcController = new NfcPreferenceController(mContext);
         mShadowNfcAdapter = shadowOf(ShadowNfcAdapter.getNfcAdapter(mContext));
     }
@@ -62,43 +68,53 @@ public class AdvancedConnectedDeviceControllerTest {
                 AVAILABLE);
     }
 
+    @Test
+    public void isDrivingModeAvailable_returnTrue() {
+        Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 1);
+
+        assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isTrue();
+    }
+
+    @Test
+    public void isDrivingModeAvailable_returnFalse() {
+        Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 0);
+
+        assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isFalse();
+    }
+
     @Test
     public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeAvailable() {
         // NFC available, driving mode available
-        final boolean isDrivingModeAvailable = true;
         mShadowNfcAdapter.setEnabled(true);
         assertThat(AdvancedConnectedDeviceController
-                .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable))
+                .getConnectedDevicesSummaryResourceId(mNfcController, true))
                 .isEqualTo(R.string.connected_devices_dashboard_summary);
     }
 
     @Test
     public void getConnectedDevicesSummaryResourceId_NFCAvailableAndDrivingModeNotAvailable() {
         // NFC is available, driving mode not available
-        final boolean isDrivingModeAvailable = false;
         mShadowNfcAdapter.setEnabled(true);
         assertThat(AdvancedConnectedDeviceController
-                .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable))
+                .getConnectedDevicesSummaryResourceId(mNfcController, false))
                 .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_summary);
     }
 
     @Test
     public void getConnectedDevicesSummaryResourceId_NFCNotAvailableDrivingModeAvailable() {
         // NFC not available, driving mode available
-        final boolean isDrivingModeAvailable = true;
         ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
         assertThat(AdvancedConnectedDeviceController
-                .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable))
+                .getConnectedDevicesSummaryResourceId(mNfcController, true))
                 .isEqualTo(R.string.connected_devices_dashboard_no_nfc_summary);
     }
 
     @Test
     public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeNotAvailable() {
         // NFC not available, driving mode not available
-        final boolean isDrivingModeAvailable = false;
         ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
         assertThat(AdvancedConnectedDeviceController
-                .getConnectedDevicesSummaryResourceId(mNfcController, isDrivingModeAvailable))
+                .getConnectedDevicesSummaryResourceId(mNfcController, false))
                 .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary);
     }
 }

From d06d1165eb3825cddab20e72cdcc292bf760507f Mon Sep 17 00:00:00 2001
From: Lei Yu <jackqdyulei@google.com>
Date: Mon, 21 May 2018 13:15:24 -0700
Subject: [PATCH 11/13] When restrict, use uid inside AppInfo

Before this CL, we use packageManager to get uid for battery
restriction. However it may not be correct all the time.

For example, RestrictedAppDetails will be opened as main user
however inside we also show work profile apps, in this case
we can't get correct uid by only using normal API in PackageManager.

This CL change it to use uid from AppInfo, which is correct all
the time.

Bug: 79992590
Test: RunSettingsRoboTests
Change-Id: Id33a5f6409d6bace0d756e5ac06432acb8b2cf65
---
 .../BackgroundActivityPreferenceController.java          | 1 +
 .../fuelgauge/batterytip/actions/RestrictAppAction.java  | 2 +-
 .../batterytip/actions/UnrestrictAppAction.java          | 9 +++++----
 .../batterytip/actions/RestrictAppActionTest.java        | 8 ++++++--
 .../batterytip/actions/UnrestrictAppActionTest.java      | 8 ++++++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 3675a8392e9..69b5e9e3139 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -129,6 +129,7 @@ public class BackgroundActivityPreferenceController extends AbstractPreferenceCo
     @VisibleForTesting
     void showDialog(boolean restricted) {
         final AppInfo appInfo = new AppInfo.Builder()
+                .setUid(mUid)
                 .setPackageName(mTargetPackage)
                 .build();
         BatteryTip tip = restricted
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
index 0009451f463..5941183df0d 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
@@ -59,7 +59,7 @@ public class RestrictAppAction extends BatteryTipAction {
             final AppInfo appInfo = appInfos.get(i);
             final String packageName = appInfo.packageName;
             // Force app standby, then app can't run in the background
-            mBatteryUtils.setForceAppStandby(mBatteryUtils.getPackageUid(packageName), packageName,
+            mBatteryUtils.setForceAppStandby(appInfo.uid, packageName,
                     AppOpsManager.MODE_IGNORED);
             if (CollectionUtils.isEmpty(appInfo.anomalyTypes)) {
                 // Only log context if there is no anomaly type
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
index fab7b01526b..9f0da639224 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
@@ -23,6 +23,7 @@ import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 
 /**
@@ -44,12 +45,12 @@ public class UnrestrictAppAction extends BatteryTipAction {
      */
     @Override
     public void handlePositiveAction(int metricsKey) {
-        final String packageName = mUnRestrictAppTip.getPackageName();
+        final AppInfo appInfo = mUnRestrictAppTip.getUnrestrictAppInfo();
         // Clear force app standby, then app can run in the background
-        mBatteryUtils.setForceAppStandby(mBatteryUtils.getPackageUid(packageName), packageName,
+        mBatteryUtils.setForceAppStandby(appInfo.uid, appInfo.packageName,
                 AppOpsManager.MODE_ALLOWED);
         mMetricsFeatureProvider.action(mContext,
-                MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, packageName, Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_CONTEXT, metricsKey));
+                MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, appInfo.packageName,
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, metricsKey));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
index 0e067653915..836f458c752 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
@@ -46,6 +46,8 @@ import java.util.List;
 @RunWith(SettingsRobolectricTestRunner.class)
 public class RestrictAppActionTest {
 
+    private static final int UID_1 = 12345;
+    private static final int UID_2 = 23456;
     private static final String PACKAGE_NAME_1 = "com.android.app1";
     private static final String PACKAGE_NAME_2 = "com.android.app2";
     private static final int ANOMALY_WAKEUP = 0;
@@ -63,9 +65,11 @@ public class RestrictAppActionTest {
 
         final List<AppInfo> mAppInfos = new ArrayList<>();
         mAppInfos.add(new AppInfo.Builder()
+                .setUid(UID_1)
                 .setPackageName(PACKAGE_NAME_1)
                 .build());
         mAppInfos.add(new AppInfo.Builder()
+                .setUid(UID_2)
                 .setPackageName(PACKAGE_NAME_2)
                 .addAnomalyType(ANOMALY_BT)
                 .addAnomalyType(ANOMALY_WAKEUP)
@@ -87,9 +91,9 @@ public class RestrictAppActionTest {
         mRestrictAppAction.handlePositiveAction(METRICS_KEY);
 
         verify(mBatteryUtils)
-                .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_1), eq(AppOpsManager.MODE_IGNORED));
+                .setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_IGNORED);
         verify(mBatteryUtils)
-                .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_2), eq(AppOpsManager.MODE_IGNORED));
+                .setForceAppStandby(UID_2, PACKAGE_NAME_2, AppOpsManager.MODE_IGNORED);
         verify(mFeatureFactory.metricsFeatureProvider).action(RuntimeEnvironment.application,
                 MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, PACKAGE_NAME_1, Pair.create(
                         MetricsProto.MetricsEvent.FIELD_CONTEXT, METRICS_KEY));
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
index f1763249111..7fdf46a8f47 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
@@ -42,6 +42,7 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(SettingsRobolectricTestRunner.class)
 public class UnrestrictAppActionTest {
 
+    private static final int UID_1 = 12345;
     private static final String PACKAGE_NAME_1 = "com.android.app1";
     private static final int METRICS_KEY = 1;
 
@@ -54,7 +55,10 @@ public class UnrestrictAppActionTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        final AppInfo appInfo = new AppInfo.Builder().setPackageName(PACKAGE_NAME_1).build();
+        final AppInfo appInfo = new AppInfo.Builder()
+                .setUid(UID_1)
+                .setPackageName(PACKAGE_NAME_1)
+                .build();
         mFeatureFactory = FakeFeatureFactory.setupForTest();
 
         mUnrestrictAppAction = new UnrestrictAppAction(RuntimeEnvironment.application,
@@ -72,7 +76,7 @@ public class UnrestrictAppActionTest {
         mUnrestrictAppAction.handlePositiveAction(METRICS_KEY);
 
         verify(mBatteryUtils)
-                .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_1), eq(AppOpsManager.MODE_ALLOWED));
+                .setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_ALLOWED);
         verify(mFeatureFactory.metricsFeatureProvider).action(RuntimeEnvironment.application,
                 MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, PACKAGE_NAME_1, Pair.create(
                         MetricsProto.MetricsEvent.FIELD_CONTEXT, METRICS_KEY));

From 4f636b90b8a41bfa3a57678e51d42547c1ba2229 Mon Sep 17 00:00:00 2001
From: timhypeng <timhypeng@google.com>
Date: Fri, 11 May 2018 14:38:22 +0800
Subject: [PATCH 12/13] Add bluetooth discoverable footer preference in
 connected devices page

* Dynamicly add preference in controller
* Add test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b
Merged-In: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b
---
 .../ConnectedDeviceDashboardFragment.java     | 18 ++++
 ...iscoverableFooterPreferenceController.java | 69 +++++++++++++
 ...verableFooterPreferenceControllerTest.java | 96 +++++++++++++++++++
 .../shadow/ShadowBluetoothAdapter.java        | 36 +++++++
 .../shadow/ShadowLocalBluetoothAdapter.java   | 36 +++++++
 5 files changed, 255 insertions(+)
 create mode 100644 src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
 create mode 100644 tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
 create mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
 create mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java

diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 26ff930558a..8495fa18fb9 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -26,7 +26,10 @@ import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -59,12 +62,27 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
         return R.xml.connected_devices;
     }
 
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final DiscoverableFooterPreferenceController discoverableFooterPreferenceController =
+                new DiscoverableFooterPreferenceController(context);
+        controllers.add(discoverableFooterPreferenceController);
+
+        return controllers;
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         use(AvailableMediaDeviceGroupController.class).init(this);
         use(ConnectedDeviceGroupController.class).init(this);
         use(PreviouslyConnectedDevicePreferenceController.class).init(this);
+        use(DiscoverableFooterPreferenceController.class).init(this);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
new file mode 100644
index 00000000000..d8d2433f15b
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2018 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.connecteddevice;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
+
+/**
+ * Controller that shows and updates the bluetooth device name
+ */
+public class DiscoverableFooterPreferenceController extends BasePreferenceController {
+    private static final String KEY = "discoverable_footer_preference";
+
+    private FooterPreference mPreference;
+    private FooterPreferenceMixin mFooterPreferenceMixin;
+
+
+    public DiscoverableFooterPreferenceController(Context context) { super(context, KEY); }
+
+    public void init(DashboardFragment fragment) {
+        mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, fragment.getLifecycle());
+    }
+
+    @VisibleForTesting
+    void init(FooterPreferenceMixin footerPreferenceMixin, FooterPreference preference) {
+        mFooterPreferenceMixin = footerPreferenceMixin;
+        mPreference = preference;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        addFooterPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    private void addFooterPreference(PreferenceScreen screen) {
+        mPreference = mFooterPreferenceMixin.createFooterPreference();
+        mPreference.setKey(KEY);
+        screen.addPreference(mPreference);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
new file mode 100644
index 00000000000..5664d277bb6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2018 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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothPan;
+import com.android.settings.testutils.shadow.ShadowLocalBluetoothAdapter;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class,
+        ShadowLocalBluetoothAdapter.class})
+public class DiscoverableFooterPreferenceControllerTest {
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private FooterPreferenceMixin mFooterPreferenceMixin;
+
+    private Context mContext;
+    private DiscoverableFooterPreferenceController mDiscoverableFooterPreferenceController;
+    private FooterPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mDiscoverableFooterPreferenceController =
+                new DiscoverableFooterPreferenceController(mContext);
+        mPreference = spy(new FooterPreference(mContext));
+        mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noBluetoothFeature_returnUnSupported() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(false);
+
+        assertThat(mDiscoverableFooterPreferenceController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_BluetoothFeature_returnSupported() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(true);
+
+        assertThat(mDiscoverableFooterPreferenceController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void displayPreference() {
+        when(mFooterPreferenceMixin.createFooterPreference()).thenReturn(mPreference);
+        mDiscoverableFooterPreferenceController.displayPreference(mScreen);
+
+        verify(mPreference).setKey(anyString());
+        verify(mScreen).addPreference(mPreference);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
new file mode 100644
index 00000000000..2bd2ec33aaa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 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.testutils.shadow;
+
+import android.bluetooth.BluetoothAdapter;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Implements(value = BluetoothAdapter.class, inheritImplementationMethods = true)
+public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBluetoothAdapter {
+    /**
+     * Do nothing, implement it to avoid null pointer error inside BluetoothAdapter
+     */
+    @Implementation
+    public List<Integer> getSupportedProfiles() {
+        return new ArrayList<Integer>();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java
new file mode 100644
index 00000000000..d215e2abfeb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 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.testutils.shadow;
+
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(LocalBluetoothAdapter.class)
+public class ShadowLocalBluetoothAdapter {
+
+    private static String sName;
+
+    @Implementation
+    public String getName() {
+        return sName;
+    }
+
+    public static void setName(String name) {
+        sName = name;
+    }
+}

From 78eb5a81ba4b1236b6764a540546de3a84ca0c3f Mon Sep 17 00:00:00 2001
From: timhypeng <timhypeng@google.com>
Date: Fri, 11 May 2018 15:41:10 +0800
Subject: [PATCH 13/13] Make device discoverable in Connected Devices settings
 page

* Set preference title by bluetooth state
* Enable bluetooth discoverable mode in Connected device page
* Add more test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb
Merged-In: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb
---
 .../ConnectedDeviceDashboardFragment.java     | 15 ++-
 ...iscoverableFooterPreferenceController.java | 84 +++++++++++++++-
 .../ConnectedDeviceDashboardFragmentTest.java |  3 +-
 ...verableFooterPreferenceControllerTest.java | 98 +++++++++++++++++--
 4 files changed, 186 insertions(+), 14 deletions(-)

diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 8495fa18fb9..81ba65cdef9 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -64,15 +64,20 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context);
+        return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final DiscoverableFooterPreferenceController discoverableFooterPreferenceController =
                 new DiscoverableFooterPreferenceController(context);
         controllers.add(discoverableFooterPreferenceController);
 
+        if (lifecycle != null) {
+            lifecycle.addObserver(discoverableFooterPreferenceController);
+        }
+
         return controllers;
     }
 
@@ -135,6 +140,12 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
                     return Arrays.asList(sir);
                 }
 
+                @Override
+                public List<AbstractPreferenceController> createPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
+
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
index d8d2433f15b..6d2b7154b4c 100644
--- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
@@ -16,36 +16,79 @@
 
 package com.android.settings.connecteddevice;
 
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.bluetooth.AlwaysDiscoverable;
+import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.FooterPreferenceMixin;
 
 /**
  * Controller that shows and updates the bluetooth device name
  */
-public class DiscoverableFooterPreferenceController extends BasePreferenceController {
+public class DiscoverableFooterPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
     private static final String KEY = "discoverable_footer_preference";
 
-    private FooterPreference mPreference;
+    @VisibleForTesting
+    BroadcastReceiver mBluetoothChangedReceiver;
     private FooterPreferenceMixin mFooterPreferenceMixin;
+    private FooterPreference mPreference;
+    private LocalBluetoothManager mLocalManager;
+    private LocalBluetoothAdapter mLocalAdapter;
+    private AlwaysDiscoverable mAlwaysDiscoverable;
 
+    public DiscoverableFooterPreferenceController(Context context) {
+        super(context, KEY);
+        mLocalManager = Utils.getLocalBtManager(context);
+        if (mLocalManager == null) {
+            return;
+        }
+        mLocalAdapter = mLocalManager.getBluetoothAdapter();
+        mAlwaysDiscoverable = new AlwaysDiscoverable(context, mLocalAdapter);
+        initReceiver();
+    }
 
-    public DiscoverableFooterPreferenceController(Context context) { super(context, KEY); }
+    private void initReceiver() {
+        mBluetoothChangedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                    final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
+                            BluetoothAdapter.ERROR);
+                    updateFooterPreferenceTitle(state);
+                }
+            }
+        };
+    }
 
     public void init(DashboardFragment fragment) {
         mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, fragment.getLifecycle());
     }
 
     @VisibleForTesting
-    void init(FooterPreferenceMixin footerPreferenceMixin, FooterPreference preference) {
+    void init(FooterPreferenceMixin footerPreferenceMixin, FooterPreference preference,
+            AlwaysDiscoverable alwaysDiscoverable) {
         mFooterPreferenceMixin = footerPreferenceMixin;
         mPreference = preference;
+        mAlwaysDiscoverable = alwaysDiscoverable;
     }
 
     @Override
@@ -66,4 +109,37 @@ public class DiscoverableFooterPreferenceController extends BasePreferenceContro
         mPreference.setKey(KEY);
         screen.addPreference(mPreference);
     }
+
+    @Override
+    public void onResume() {
+        mContext.registerReceiver(mBluetoothChangedReceiver,
+                new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
+        mAlwaysDiscoverable.start();
+        updateFooterPreferenceTitle(mLocalAdapter.getState());
+    }
+
+    @Override
+    public void onPause() {
+        mContext.unregisterReceiver(mBluetoothChangedReceiver);
+        mAlwaysDiscoverable.stop();
+    }
+
+    private void updateFooterPreferenceTitle (int bluetoothState) {
+        if (bluetoothState == BluetoothAdapter.STATE_ON) {
+            mPreference.setTitle(getPreferenceTitle());
+        } else {
+            mPreference.setTitle(R.string.bluetooth_off_footer);
+        }
+    }
+
+    private CharSequence getPreferenceTitle() {
+        final String deviceName = mLocalAdapter.getName();
+        if (TextUtils.isEmpty(deviceName)) {
+            return null;
+        }
+
+        return TextUtils.expandTemplate(
+                mContext.getText(R.string.bluetooth_device_name_summary),
+                BidiFormatter.getInstance().unicodeWrap(deviceName));
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 90641792639..fd1ec157b65 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -32,6 +32,7 @@ import android.provider.SearchIndexableResource;
 import com.android.settings.R;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -48,7 +49,7 @@ import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class,
-        ShadowConnectivityManager.class})
+        ShadowConnectivityManager.class, ShadowBluetoothAdapter.class})
 public class ConnectedDeviceDashboardFragmentTest {
     @Mock
     private PackageManager mPackageManager;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
index 5664d277bb6..8cad0bfe70d 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
@@ -16,18 +16,23 @@
 package com.android.settings.connecteddevice;
 
 import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
 
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.bluetooth.AlwaysDiscoverable;
+import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
@@ -41,32 +46,49 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class,
         ShadowLocalBluetoothAdapter.class})
 public class DiscoverableFooterPreferenceControllerTest {
+    private static final String DEVICE_NAME = "device name";
+    private static final String KEY = "discoverable_footer_preference";
+
     @Mock
     private PackageManager mPackageManager;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
     private FooterPreferenceMixin mFooterPreferenceMixin;
+    @Mock
+    private AlwaysDiscoverable mAlwaysDiscoverable;
 
     private Context mContext;
-    private DiscoverableFooterPreferenceController mDiscoverableFooterPreferenceController;
     private FooterPreference mPreference;
+    private DiscoverableFooterPreferenceController mDiscoverableFooterPreferenceController;
+    private BroadcastReceiver mBluetoothChangedReceiver;
+    private ShadowApplication mShadowApplication;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mShadowApplication = Shadows.shadowOf(RuntimeEnvironment.application);
         mContext = spy(RuntimeEnvironment.application);
+
         doReturn(mPackageManager).when(mContext).getPackageManager();
         mDiscoverableFooterPreferenceController =
                 new DiscoverableFooterPreferenceController(mContext);
         mPreference = spy(new FooterPreference(mContext));
-        mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference);
+        mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference,
+                mAlwaysDiscoverable);
+        mBluetoothChangedReceiver = mDiscoverableFooterPreferenceController
+                .mBluetoothChangedReceiver;
     }
 
     @Test
@@ -78,7 +100,7 @@ public class DiscoverableFooterPreferenceControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatus_BluetoothFeature_returnSupported() {
+    public void getAvailabilityStatus_BluetoothFeature_returnAvailable() {
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(true);
 
         assertThat(mDiscoverableFooterPreferenceController.getAvailabilityStatus()).isEqualTo(
@@ -90,7 +112,69 @@ public class DiscoverableFooterPreferenceControllerTest {
         when(mFooterPreferenceMixin.createFooterPreference()).thenReturn(mPreference);
         mDiscoverableFooterPreferenceController.displayPreference(mScreen);
 
-        verify(mPreference).setKey(anyString());
+        verify(mPreference).setKey(KEY);
         verify(mScreen).addPreference(mPreference);
     }
-}
+
+    @Test
+    public void onResume() {
+        mDiscoverableFooterPreferenceController.onResume();
+        assertThat(getRegisteredBroadcastReceivers()).contains(mBluetoothChangedReceiver);
+        verify(mAlwaysDiscoverable).start();
+    }
+
+    @Test
+    public void onPause() {
+        mDiscoverableFooterPreferenceController.onResume();
+        mDiscoverableFooterPreferenceController.onPause();
+
+        assertThat(getRegisteredBroadcastReceivers()).doesNotContain(mBluetoothChangedReceiver);
+        verify(mAlwaysDiscoverable).stop();
+    }
+
+    @Test
+    public void onBluetoothStateChanged_bluetoothOn_updateTitle() {
+        ShadowLocalBluetoothAdapter.setName(DEVICE_NAME);
+        sendBluetoothStateChangedIntent(BluetoothAdapter.STATE_ON);
+
+        assertThat(mPreference.getTitle()).isEqualTo(generateTitle(DEVICE_NAME));
+    }
+
+    @Test
+    public void onBluetoothStateChanged_bluetoothOff_updateTitle(){
+        ShadowLocalBluetoothAdapter.setName(DEVICE_NAME);
+        sendBluetoothStateChangedIntent(BluetoothAdapter.STATE_OFF);
+
+        assertThat(mPreference.getTitle()).isEqualTo(generateTitle(null));
+    }
+
+    private CharSequence generateTitle(String deviceName) {
+        if (deviceName == null) {
+            return mContext.getString(R.string.bluetooth_off_footer);
+
+        } else {
+            return TextUtils.expandTemplate(
+                    mContext.getText(R.string.bluetooth_device_name_summary),
+                    BidiFormatter.getInstance().unicodeWrap(deviceName));
+        }
+    }
+
+    private void sendBluetoothStateChangedIntent(int state) {
+        Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+        intent.putExtra(BluetoothAdapter.EXTRA_STATE, state);
+        mBluetoothChangedReceiver.onReceive(mContext, intent);
+    }
+
+    /**
+     * Return a list of all the registered broadcast receivers
+     */
+    private List<BroadcastReceiver> getRegisteredBroadcastReceivers() {
+        List<BroadcastReceiver> registeredBroadcastReceivers = new ArrayList();
+        List<ShadowApplication.Wrapper> registeredReceivers =
+                mShadowApplication.getRegisteredReceivers();
+        for (ShadowApplication.Wrapper wrapper : registeredReceivers) {
+            registeredBroadcastReceivers.add(wrapper.getBroadcastReceiver());
+        }
+        return registeredBroadcastReceivers;
+    }
+}
\ No newline at end of file