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

feat(expressive): Add new magnification banner for expressive design

Browse Source 
Fix: 378876803
Flag: EXEMPT custom flagging helpers from Settings and Setup
Test: observe new image; see bug screenshots
Change-Id: I3654563352e223af1a0d679318da45da2b4bc8be
This commit is contained in:
Daniel Norman
2025-02-20 13:11:16 -08:00
parent 69c4f2dff0
commit 165f4ea76e
2 changed files with 2358 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2350
res/raw/accessibility_magnification_banner_expressive.json Normal file
View File

File diff suppressed because it is too large Load Diff

9
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -62,8 +62,10 @@ import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexableRaw;
import com.android.settingslib.widget.IllustrationPreference; import com.android.settingslib.widget.IllustrationPreference;
import com.android.settingslib.widget.SettingsThemeHelper;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -113,9 +115,14 @@ public class ToggleScreenMagnificationPreferenceFragment extends
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@NonNull Bundle savedInstanceState) { @NonNull Bundle savedInstanceState) {
mFeatureName = getString(R.string.accessibility_screen_magnification_title); mFeatureName = getString(R.string.accessibility_screen_magnification_title);
final boolean useExpressiveTheme = WizardManagerHelper.isAnySetupWizard(getIntent())
? ThemeHelper.shouldApplyGlifExpressiveStyle(getPrefContext())
: SettingsThemeHelper.isExpressiveTheme(getPrefContext());
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE) mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName()) .authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.raw.a11y_magnification_banner)) .appendPath(String.valueOf(useExpressiveTheme
? R.raw.accessibility_magnification_banner_expressive
: R.raw.a11y_magnification_banner))
.build(); .build();
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> { mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext())); mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));