Shortcut Helper - Fix it not showing on a secondary user
- The activity needs "showForAllUsers" to be true, for it to show
- The broadcast needs to be registered for all users, since the Activity
sends broadcast using their own user id
Flag: com.android.systemui.keyboard_shortcut_helper_rewrite
Test: Manual
Fixes: 343884480
Change-Id: I0b9ca11c42d709c06516f2f4a1492d0e071bd016
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 8a99263..7104744 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -1109,6 +1109,7 @@
<activity android:name="com.android.systemui.keyboard.shortcut.ui.view.ShortcutHelperActivity"
android:exported="false"
+ android:showForAllUsers="true"
android:theme="@style/ShortcutHelperTheme"
android:excludeFromRecents="true"
android:finishOnCloseSystemDialogs="true" />
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperRepository.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperRepository.kt
index 9450af4..a1d823e 100644
--- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperRepository.kt
@@ -20,6 +20,7 @@
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
+import android.os.UserHandle
import com.android.systemui.CoreStartable
import com.android.systemui.broadcast.BroadcastDispatcher
import com.android.systemui.dagger.SysUISingleton
@@ -80,7 +81,8 @@
}
},
filter = IntentFilter(action),
- flags = Context.RECEIVER_EXPORTED or Context.RECEIVER_VISIBLE_TO_INSTANT_APPS
+ flags = Context.RECEIVER_EXPORTED or Context.RECEIVER_VISIBLE_TO_INSTANT_APPS,
+ user = UserHandle.ALL,
)
}
}
