Merge "Remove divider above device switcher in panel" into qt-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a8fa7cc..68a7cbb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1475,7 +1475,7 @@
<!-- Lock screen settings -->
<activity android:name=".password.ConfirmDeviceCredentialActivity"
android:exported="true"
- android:taskAffinity=".password.ConfirmDeviceCredentialActivity"
+ android:taskAffinity="com.android.settings.workmode"
android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
@@ -1493,7 +1493,7 @@
android:exported="false"
android:permission="android.permission.MANAGE_USERS"
android:resizeableActivity="false"
- android:taskAffinity=".password.ConfirmDeviceCredentialActivity"
+ android:taskAffinity="com.android.settings.workmode"
android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />
@@ -2810,6 +2810,7 @@
<activity android:name=".enterprise.ActionDisabledByAdminDialog"
android:theme="@style/Transparent"
+ android:taskAffinity="com.android.settings.enterprise"
android:excludeFromRecents="true"
android:launchMode="singleTop">
<intent-filter android:priority="1">
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
index c6466e8..f847612 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
@@ -23,6 +23,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.hardware.display.ColorDisplayManager;
+import android.os.UserHandle;
import android.util.Log;
import com.android.settings.R;
@@ -115,7 +116,8 @@
private void sendBroadcast() {
final Intent intent = new Intent(ACTION_GRAYSCALE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
- mAppContext.sendBroadcast(intent, Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS);
+ mAppContext.sendBroadcastAsUser(intent, UserHandle.CURRENT,
+ Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS);
}
public class Receiver extends BroadcastReceiver {
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionControllerTest.java
index 2fe4697..58a8d5b 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionControllerTest.java
@@ -26,6 +26,7 @@
import android.content.Context;
import android.content.Intent;
import android.hardware.display.ColorDisplayManager;
+import android.os.UserHandle;
import org.junit.Before;
import org.junit.Test;
@@ -87,6 +88,7 @@
public void onActionClick_shouldSendBroadcast() {
mController.onActionClick();
- verify(mContext).sendBroadcast(any(Intent.class), any(String.class));
+ verify(mContext).sendBroadcastAsUser(any(Intent.class), any(UserHandle.class),
+ any(String.class));
}
}