PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DragToEdit Dynaimc Title" into main

Browse Source
This commit is contained in:
Riley Jones
2024-02-23 19:46:13 +00:00
committed by Android (Google) Code Review
parent 950d9e9fee 43420f16af
commit 14ec4f08c3
5 changed files with 221 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/accessibility_shortcut_keys.xml
View File

@@ -16,6 +16,7 @@
--> -->
<resources> <resources>
<string name="accessibility_shortcut_description_pref" translatable="false">shortcut_description</string>
<string name="accessibility_shortcut_volume_keys_pref" translatable="false">shortcut_volume_keys_pref</string> <string name="accessibility_shortcut_volume_keys_pref" translatable="false">shortcut_volume_keys_pref</string>
<string name="accessibility_shortcut_gesture_pref" translatable="false">shortcut_gesture_pref</string> <string name="accessibility_shortcut_gesture_pref" translatable="false">shortcut_gesture_pref</string>
<string name="accessibility_shortcut_nav_button_pref" translatable="false">shortcut_nav_button_pref</string> <string name="accessibility_shortcut_nav_button_pref" translatable="false">shortcut_nav_button_pref</string>

4
res/values/strings.xml
View File

@@ -5112,6 +5112,10 @@
<string name="accessibility_shortcut_type_hardware">Hold volume keys</string> <string name="accessibility_shortcut_type_hardware">Hold volume keys</string>
<!-- Summary for accessibility shortcut preference for magnification triple tap shortcut type. [CHAR LIMIT=NONE] --> <!-- Summary for accessibility shortcut preference for magnification triple tap shortcut type. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_type_triple_tap">Triple tap screen</string> <string name="accessibility_shortcut_type_triple_tap">Triple tap screen</string>
<!-- Generic title for editing the shortcuts of multiple accessibility features. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_screen_title">Edit accessibility shortcuts</string>
<!-- Prompt for editing the shortcuts of multiple accessibility features. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_screen_prompt">Chose your shortcut for %1$s</string>
<!-- Button text for the accessibility dialog continue to the next screen for hearing aid. [CHAR LIMIT=32] --> <!-- Button text for the accessibility dialog continue to the next screen for hearing aid. [CHAR LIMIT=32] -->
<string name="accessibility_hearingaid_instruction_continue_button">Continue</string> <string name="accessibility_hearingaid_instruction_continue_button">Continue</string>

106
res/xml/accessibility_edit_shortcuts.xml
View File

@@ -18,62 +18,66 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"> xmlns:settings="http://schemas.android.com/apk/res-auto">
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference <PreferenceCategory
android:key="@string/accessibility_shortcut_fab_pref" android:key="@string/accessibility_shortcut_description_pref">
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.FloatingButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_gesture_pref" android:key="@string/accessibility_shortcut_fab_pref"
android:persistent="false" android:persistent="false"
android:selectable="true" android:selectable="true"
settings:allowDividerAbove="false" settings:allowDividerAbove="false"
settings:allowDividerBelow="false" settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.GestureShortcutOptionController" /> settings:controller="com.android.settings.accessibility.shortcuts.FloatingButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_nav_button_pref" android:key="@string/accessibility_shortcut_gesture_pref"
android:persistent="false" android:persistent="false"
android:selectable="true" android:selectable="true"
settings:allowDividerAbove="false" settings:allowDividerAbove="false"
settings:allowDividerBelow="false" settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.NavButtonShortcutOptionController" /> settings:controller="com.android.settings.accessibility.shortcuts.GestureShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_volume_keys_pref" android:key="@string/accessibility_shortcut_nav_button_pref"
android:persistent="false" android:persistent="false"
android:selectable="true" android:selectable="true"
settings:allowDividerAbove="false" settings:allowDividerAbove="false"
settings:allowDividerBelow="false" settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.VolumeKeysShortcutOptionController" /> settings:controller="com.android.settings.accessibility.shortcuts.NavButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_two_fingers_double_tap_pref" android:key="@string/accessibility_shortcut_volume_keys_pref"
android:persistent="false" android:persistent="false"
android:selectable="true" android:selectable="true"
settings:allowDividerAbove="false" settings:allowDividerAbove="false"
settings:allowDividerBelow="false" settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TwoFingersDoubleTapShortcutOptionController" /> settings:controller="com.android.settings.accessibility.shortcuts.VolumeKeysShortcutOptionController" />
<Preference <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:icon="@drawable/ic_keyboard_arrow_down" android:key="@string/accessibility_shortcut_two_fingers_double_tap_pref"
android:key="@string/accessibility_shortcuts_advanced_collapsed" android:persistent="false"
android:persistent="false" android:selectable="true"
android:selectable="true" settings:allowDividerAbove="false"
android:title="@string/accessibility_shortcut_edit_dialog_title_advance" settings:allowDividerBelow="false"
settings:allowDividerAbove="false" settings:controller="com.android.settings.accessibility.shortcuts.TwoFingersDoubleTapShortcutOptionController" />
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.AdvancedShortcutsPreferenceController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference <Preference
android:key="@string/accessibility_shortcut_triple_tap_pref" android:icon="@drawable/ic_keyboard_arrow_down"
android:persistent="false" android:key="@string/accessibility_shortcuts_advanced_collapsed"
android:selectable="true" android:persistent="false"
settings:allowDividerAbove="false" android:selectable="true"
settings:allowDividerBelow="false" android:title="@string/accessibility_shortcut_edit_dialog_title_advance"
settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" /> settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.AdvancedShortcutsPreferenceController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_triple_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

90
src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
View File

@@ -27,16 +27,21 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME; import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE;
import android.app.Activity;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.icu.text.ListFormatter;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Pair;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -48,9 +53,12 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.accessibility.dialog.AccessibilityTarget;
import com.android.internal.accessibility.dialog.AccessibilityTargetHelper;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.accessibility.AccessibilitySetupWizardUtils; import com.android.settings.accessibility.AccessibilitySetupWizardUtils;
import com.android.settings.accessibility.Flags;
import com.android.settings.accessibility.PreferredShortcuts; import com.android.settings.accessibility.PreferredShortcuts;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
@@ -60,7 +68,10 @@ import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.GlifPreferenceLayout; import com.google.android.setupdesign.GlifPreferenceLayout;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
@@ -171,6 +182,36 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
registerSettingsObserver(); registerSettingsObserver();
} }
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);
Activity activity = getActivity();
if (!activity.getIntent().getAction().equals(
Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS)
|| !Flags.editShortcutsInFullScreen()) {
return;
}
// TODO(b/325664350): Implement shortcut type for "all shortcuts"
List<AccessibilityTarget> accessibilityTargets =
AccessibilityTargetHelper.getInstalledTargets(
activity.getBaseContext(), AccessibilityManager.ACCESSIBILITY_SHORTCUT_KEY);
Pair<String, String> titles = getTitlesFromAccessibilityTargetList(
mShortcutTargets,
accessibilityTargets,
activity.getResources()
);
activity.setTitle(titles.first);
String categoryKey = activity.getResources().getString(
R.string.accessibility_shortcut_description_pref);
findPreference(categoryKey).setTitle(titles.second);
}
@NonNull @NonNull
@Override @Override
public RecyclerView onCreateRecyclerView( public RecyclerView onCreateRecyclerView(
@@ -275,7 +316,6 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
} }
mShortcutTargets = Set.of(targets); mShortcutTargets = Set.of(targets);
// TODO(318748373): use 'targets' to populate title when no title is given
} }
@Override @Override
@@ -356,4 +396,52 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
// A11y Nav Button // A11y Nav Button
refreshPreferenceController(NavButtonShortcutOptionController.class); refreshPreferenceController(NavButtonShortcutOptionController.class);
} }
/**
* Generates a title & subtitle pair describing the features whose shortcuts are being edited.
*
* @param shortcutTargets string list of component names corresponding to
* the relevant shortcut targets.
* @param accessibilityTargets list of accessibility targets
* to try and find corresponding labels in.
* @return pair of strings to be used as page title and subtitle.
* If there is only one shortcut label, It is displayed in the title and the subtitle is null.
* Otherwise, the title is a generic prompt and the subtitle lists all shortcut labels.
*/
@VisibleForTesting
static Pair<String, String> getTitlesFromAccessibilityTargetList(
Set<String> shortcutTargets,
List<AccessibilityTarget> accessibilityTargets,
Resources resources) {
ArrayList<CharSequence> featureLabels = new ArrayList<>();
Map<String, CharSequence> accessibilityTargetLabels = new ArrayMap<>();
accessibilityTargets.forEach((target) -> accessibilityTargetLabels.put(
target.getId(), target.getLabel()));
for (String target: shortcutTargets) {
if (accessibilityTargetLabels.containsKey(target)) {
featureLabels.add(accessibilityTargetLabels.get(target));
} else {
throw new IllegalStateException("Shortcut target does not have a label: " + target);
}
}
if (featureLabels.size() == 1) {
return new Pair<>(
resources.getString(
R.string.accessibility_shortcut_title, featureLabels.get(0)),
null
);
} else if (featureLabels.size() == 0) {
throw new IllegalStateException("Found no labels for any shortcut targets.");
} else {
return new Pair<>(
resources.getString(R.string.accessibility_shortcut_edit_screen_title),
resources.getString(
R.string.accessibility_shortcut_edit_screen_prompt,
ListFormatter.getInstance().format(featureLabels))
);
}
}
} }

72
tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
View File

@@ -28,6 +28,9 @@ import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_P
import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW; import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
import android.content.ComponentName; import android.content.ComponentName;
@@ -35,7 +38,9 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings; import android.provider.Settings;
import android.util.Pair;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@@ -46,6 +51,7 @@ import androidx.preference.TwoStatePreference;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.internal.accessibility.common.ShortcutConstants; import com.android.internal.accessibility.common.ShortcutConstants;
import com.android.internal.accessibility.dialog.AccessibilityTarget;
import com.android.internal.accessibility.util.ShortcutUtils; import com.android.internal.accessibility.util.ShortcutUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
@@ -60,6 +66,7 @@ import com.google.android.setupcompat.util.WizardManagerHelper;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
@@ -89,6 +96,9 @@ public class EditShortcutsPreferenceFragmentTest {
private static final String TARGET = MAGNIFICATION_CONTROLLER_NAME; private static final String TARGET = MAGNIFICATION_CONTROLLER_NAME;
private static final Set<String> TARGETS = Set.of(TARGET); private static final Set<String> TARGETS = Set.of(TARGET);
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private final Context mContext = ApplicationProvider.getApplicationContext(); private final Context mContext = ApplicationProvider.getApplicationContext();
private FragmentActivity mActivity; private FragmentActivity mActivity;
private FragmentScenario<EditShortcutsPreferenceFragment> mFragmentScenario; private FragmentScenario<EditShortcutsPreferenceFragment> mFragmentScenario;
@@ -414,6 +424,60 @@ public class EditShortcutsPreferenceFragmentTest {
} }
@Test
public void findTitles_withSingleTarget_hasNullSubtitle() {
final String fake_label = "FAKE";
List<AccessibilityTarget> accessibilityTargets = List.of(
generateAccessibilityTargetMock(TARGET_FAKE_COMPONENT, fake_label));
Pair<String, String> titles = EditShortcutsPreferenceFragment
.getTitlesFromAccessibilityTargetList(
Set.of(TARGET_FAKE_COMPONENT.flattenToString()),
accessibilityTargets, mActivity.getResources()
);
assertThat(titles.first).isNotNull();
assertThat(titles.first).contains(fake_label);
assertThat(titles.second).isNull();
}
@Test
public void findTitles_withMoreTargets_hasSubtitle() {
final String fake_label = "FAKE";
final String magnification_label = "MAGNIFICATION";
List<AccessibilityTarget> accessibilityTargets = List.of(
generateAccessibilityTargetMock(TARGET_FAKE_COMPONENT, fake_label),
generateAccessibilityTargetMock(MAGNIFICATION_COMPONENT_NAME, magnification_label));
Pair<String, String> titles = EditShortcutsPreferenceFragment
.getTitlesFromAccessibilityTargetList(
Set.of(TARGET_FAKE_COMPONENT.flattenToString(),
MAGNIFICATION_COMPONENT_NAME.flattenToString()),
accessibilityTargets, mActivity.getResources()
);
assertThat(titles.first).isNotNull();
assertThat(titles.second).isNotNull();
assertThat(titles.second).contains(fake_label);
assertThat(titles.second).contains(magnification_label);
}
@Test
public void findTitles_targetMissing_labelNotInTitles() {
final String fake_label = "FAKE";
List<AccessibilityTarget> accessibilityTargets = List.of(
generateAccessibilityTargetMock(TARGET_FAKE_COMPONENT, fake_label));
assertThrows(IllegalStateException.class,
() -> EditShortcutsPreferenceFragment
.getTitlesFromAccessibilityTargetList(
Set.of(MAGNIFICATION_COMPONENT_NAME.flattenToString()),
accessibilityTargets, mActivity.getResources()
));
}
private void assertLaunchSubSettingWithCurrentTargetComponents( private void assertLaunchSubSettingWithCurrentTargetComponents(
String componentName, boolean isInSuw) { String componentName, boolean isInSuw) {
Intent intent = shadowOf(mActivity.getApplication()).getNextStartedActivity(); Intent intent = shadowOf(mActivity.getApplication()).getNextStartedActivity();
@@ -480,4 +544,12 @@ public class EditShortcutsPreferenceFragmentTest {
intent.putExtra(EXTRA_IS_DEFERRED_SETUP, isInSuw); intent.putExtra(EXTRA_IS_DEFERRED_SETUP, isInSuw);
return intent; return intent;
} }
private AccessibilityTarget generateAccessibilityTargetMock(
ComponentName componentName, String label) {
AccessibilityTarget target = mock(AccessibilityTarget.class);
when(target.getComponentName()).thenReturn(componentName);
when(target.getLabel()).thenReturn(label);
return target;
}
} }