Hide "Magnify with button" if no navbar is shown
Devices without a software-rendered navigation bar will be unable to
use "Magnify with button" as no accessibility button trigger for
magnification can be shown.
In this case, we hide the setting by preventing
MagnificationPreferenceFragment from showing the list of mag
modes, instead launching directly into the PreferenceFragment for
"Magnify with triple-tap"
Bug: 36862906
Test: Manual - Configured marlin to disable the navigation bar and
verified behavior in SUW and Settings
Change-Id: Ie614ec292d7779044274b7c79eaed1df080c0fd1
This commit is contained in:
@@ -18,9 +18,9 @@ package com.android.settings.accessibility;
|
||||
|
||||
import android.accessibilityservice.AccessibilityServiceInfo;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.pm.ServiceInfo;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.text.TextUtils;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
@@ -79,6 +79,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
|
||||
findService(SCREEN_READER_PACKAGE_NAME, SCREEN_READER_SERVICE_NAME));
|
||||
updateAccessibilityServicePreference(mSelectToSpeakPreference,
|
||||
findService(SELECT_TO_SPEAK_PACKAGE_NAME, SELECT_TO_SPEAK_SERVICE_NAME));
|
||||
configureMagnificationPreferenceIfNeeded(mDisplayMagnificationPreference);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -145,4 +146,18 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
|
||||
}
|
||||
extras.putString(AccessibilitySettings.EXTRA_SUMMARY, description);
|
||||
}
|
||||
|
||||
private static void configureMagnificationPreferenceIfNeeded(Preference preference) {
|
||||
// Some devices support only a single magnification mode. In these cases, we redirect to
|
||||
// the magnification mode's UI directly, rather than showing a PreferenceScreen with a
|
||||
// single list item.
|
||||
final Context context = preference.getContext();
|
||||
if (!MagnificationPreferenceFragment.isApplicable(context.getResources())) {
|
||||
preference.setFragment(
|
||||
ToggleScreenMagnificationPreferenceFragmentForSetupWizard.class.getName());
|
||||
final Bundle extras = preference.getExtras();
|
||||
MagnificationPreferenceFragment.populateMagnificationGesturesPreferenceExtras(extras,
|
||||
context);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user