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

Merge "Disabling elements on the A11y Shortcut setting subpage" into main

Browse Source
This commit is contained in:
Riley Jones
2025-01-28 13:24:42 -08:00
committed by Android (Google) Code Review
parent ec58402c03 94621548c1
commit 6e12194015
9 changed files with 205 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/accessibility/AccessibilityButtonFragment.java
View File

@@ -16,9 +16,14 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
import com.android.internal.accessibility.util.ShortcutUtils;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -61,5 +66,13 @@ public class AccessibilityButtonFragment extends DashboardFragment {
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_button_settings);
new BaseSearchIndexProvider(R.xml.accessibility_button_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {
// Page should be unsearchable if there are no active button targets
String targets = Settings.Secure.getStringForUser(context.getContentResolver(),
ShortcutUtils.convertToKey(SOFTWARE), context.getUserId());
return targets != null && !targets.isEmpty();
}
};
}

34
src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java
View File

@@ -16,9 +16,13 @@
package com.android.settings.accessibility;
import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
import android.content.Context;
import android.content.res.Resources;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -32,14 +36,39 @@ import java.util.List;
* Preference controller for accessibility button preference.
*/
public class AccessibilityButtonPreferenceController extends BasePreferenceController {
public AccessibilityButtonPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
return AVAILABLE;
} else {
if (mContext.getSystemService(AccessibilityManager.class)
.getAccessibilityShortcutTargets(SOFTWARE).isEmpty()) {
return DISABLED_DEPENDENT_SETTING;
} else {
return AVAILABLE;
}
}
}
@Override
public void updateState(@NonNull Preference preference) {
super.updateState(preference);
refreshSummary(preference);
}
@Override
public @NonNull CharSequence getSummary() {
if (getAvailabilityStatus() == AVAILABLE) {
return "";
} else {
return mContext.getString(
R.string.accessibility_shortcut_unassigned_setting_unavailable_summary,
AccessibilityUtil.getShortcutSummaryList(mContext, SOFTWARE));
}
}
@Override
@@ -47,7 +76,6 @@ public class AccessibilityButtonPreferenceController extends BasePreferenceContr
super.displayPreference(screen);
final Preference preference = screen.findPreference(getPreferenceKey());
preference.setTitle(getPreferenceTitleResource());
}
@Override

42
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java → src/com/android/settings/accessibility/HardwareShortcutFromLockscreenPreferenceController.java
View File

@@ -15,6 +15,7 @@
*/
package com.android.settings.accessibility;
import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
@@ -22,16 +23,21 @@ import android.content.ContentResolver;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
* Settings page for accessibility shortcut
* Setting to allow the hardware shortcut to turn on from the lock screen
*/
public class AccessibilityShortcutPreferenceController extends TogglePreferenceController {
public AccessibilityShortcutPreferenceController(Context context, String preferenceKey) {
public class HardwareShortcutFromLockscreenPreferenceController
extends TogglePreferenceController {
public HardwareShortcutFromLockscreenPreferenceController(
Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -56,7 +62,33 @@ public class AccessibilityShortcutPreferenceController extends TogglePreferenceC
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
if (!com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
return AVAILABLE;
} else {
if (mContext.getSystemService(AccessibilityManager.class)
.getAccessibilityShortcutTargets(HARDWARE).isEmpty()) {
return DISABLED_DEPENDENT_SETTING;
} else {
return AVAILABLE;
}
}
}
@Override
public void updateState(@NonNull Preference preference) {
super.updateState(preference);
refreshSummary(preference);
}
@Override
public @NonNull CharSequence getSummary() {
if (getAvailabilityStatus() == AVAILABLE) {
return mContext.getString(R.string.accessibility_shortcut_description);
} else {
return mContext.getString(
R.string.accessibility_shortcut_unassigned_setting_unavailable_summary,
AccessibilityUtil.getShortcutSummaryList(mContext, HARDWARE));
}
}
@Override