From 13667d5d090e191e0bf40373d88d1069499892b0 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Thu, 27 Apr 2023 13:59:48 +0100 Subject: [PATCH] Hide notes app lock screen shortcut when there is no default notes app set Test: atest SystemUITests:NoteTaskControllerTest atest SystemUITests:NoteTaskQuickAffordanceConfigTest atest SystemUITests:LaunchNotesRoleSettingsTrampolineActivityTest Bug: 266686199 Change-Id: I911f1f0283a4d3a3c136424df51efe473341ace4 --- packages/SystemUI/AndroidManifest.xml | 12 ++ packages/SystemUI/res/values/strings.xml | 13 ++ ...unchNotesRoleSettingsTrampolineActivity.kt | 54 +++++++ .../systemui/notetask/NoteTaskController.kt | 56 ++++--- .../systemui/notetask/NoteTaskModule.kt | 4 + .../NoteTaskQuickAffordanceConfig.kt | 82 +++++++++-- packages/SystemUI/tests/AndroidManifest.xml | 11 ++ ...NotesRoleSettingsTrampolineActivityTest.kt | 86 +++++++++++ .../notetask/NoteTaskControllerTest.kt | 138 +++++++++++++++++- .../NoteTaskQuickAffordanceConfigTest.kt | 89 +++++++++++ 10 files changed, 510 insertions(+), 35 deletions(-) create mode 100644 packages/SystemUI/src/com/android/systemui/notetask/LaunchNotesRoleSettingsTrampolineActivity.kt create mode 100644 packages/SystemUI/tests/src/com/android/systemui/notetask/LaunchNotesRoleSettingsTrampolineActivityTest.kt diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 6e55000dfe8a4..c8eb4b41f0030 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -992,6 +992,18 @@ android:excludeFromRecents="true" android:resizeableActivity="false" android:theme="@android:style/Theme.NoDisplay" /> + + + + + + + diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 853930e174a7c..6dc95a33c23f1 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -3035,6 +3035,19 @@ --> • At least one device is available + + Select a default notes app to use notetaking shortcut + + + Open settings +