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

Convert AccessibilitySettings into a DashboardFragment

Browse Source 
Bug: 135056871
Test: manual, robotests
Change-Id: Iafc359fc3bba1adce46a28b18449af2e9abf8a29
This commit is contained in:
Mill Chen
2019-06-21 18:01:34 +08:00
parent 2ee1249b01
commit e5ab0d68f2
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -28,7 +28,6 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.net.Uri; import android.net.Uri;
@@ -56,11 +55,10 @@ import androidx.preference.SwitchPreference;
import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor; import com.android.internal.content.PackageMonitor;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.display.DarkUIPreferenceController; import com.android.settings.display.DarkUIPreferenceController;
import com.android.settings.display.FontSizePreferenceController; import com.android.settings.display.FontSizePreferenceController;
import com.android.settings.display.ToggleFontSizePreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -81,9 +79,11 @@ import java.util.Set;
* Activity with the accessibility settings. * Activity with the accessibility settings.
*/ */
@SearchIndexable @SearchIndexable
public class AccessibilitySettings extends SettingsPreferenceFragment implements public class AccessibilitySettings extends DashboardFragment implements
Preference.OnPreferenceChangeListener { Preference.OnPreferenceChangeListener {
private static final String TAG = "AccessibilitySettings";
// Index of the first preference in a preference category. // Index of the first preference in a preference category.
private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = -1; private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = -1;
@@ -362,6 +362,16 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
return super.onPreferenceTreeClick(preference); return super.onPreferenceTreeClick(preference);
} }
@Override
protected int getPreferenceScreenResId() {
return R.xml.accessibility_settings;
}
@Override
protected String getLogTag() {
return TAG;
}
public static CharSequence getServiceSummary(Context context, AccessibilityServiceInfo info, public static CharSequence getServiceSummary(Context context, AccessibilityServiceInfo info,
boolean serviceEnabled) { boolean serviceEnabled) {
final String serviceState = serviceEnabled final String serviceState = serviceEnabled