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

Merge "Accessibility shortcut secondary action - divide different fragment for different fragment type"

Browse Source
This commit is contained in:
Jason Hsu
2019-12-26 13:42:17 +00:00
committed by Android (Google) Code Review
parent 252553c07c 3d94a57d97
commit 24af3f4c81
6 changed files with 104 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.display.DarkUIPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -402,7 +403,24 @@ public class AccessibilitySettings extends DashboardFragment {
preference.setEnabled(true);
}
preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
switch (AccessibilityUtil.getAccessibilityServiceFragmentType(info)) {
case AccessibilityServiceFragmentType.LEGACY:
preference.setFragment(
LegacyAccessibilityServicePreferenceFragment.class.getName());
break;
case AccessibilityServiceFragmentType.INVISIBLE:
preference.setFragment(
InvisibleToggleAccessibilityServicePreferenceFragment.class.getName());
break;
case AccessibilityServiceFragmentType.INTUITIVE:
preference.setFragment(
ToggleAccessibilityServicePreferenceFragment.class.getName());
break;
default:
// impossible status
throw new AssertionError();
}
preference.setPersistent(true);
final Bundle extras = preference.getExtras();