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

Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0

Browse Source 
Change-Id: I120d9b2135ed0c6d65461dde644d5a55559c85d4
This commit is contained in:
Automerger Merge Worker
2020-03-06 08:45:07 +00:00
parent 5cd16c76ab 696d25adf0
commit 5b97ecf287
12 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
View File

@@ -285,7 +285,6 @@ public class AccessibilityEditDialogUtils {
final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
final ImageSpan imageSpan = new ImageSpan(icon);
imageSpan.setContentDescription("");
icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
icon.setBounds(0, 0, lineHeight, lineHeight);
spannableMessage.setSpan(
imageSpan, indexIconStart, indexIconEnd,

1
src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
View File

@@ -178,7 +178,6 @@ public class AccessibilityGestureNavigationTutorial {
final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
final ImageSpan imageSpan = new ImageSpan(icon);
imageSpan.setContentDescription("");
icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
icon.setBounds(0, 0, lineHeight, lineHeight);
spannableMessage.setSpan(
imageSpan, indexIconStart, indexIconEnd,

3
src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
View File

@@ -43,7 +43,6 @@ import java.util.List;
public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
private static final int DIALOG_ID_EDIT_SHORTCUT = 1;
private final Handler mHandler = new Handler();
private SettingsContentObserver mSettingsContentObserver;
@@ -117,7 +116,7 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
@Override
public void onSettingsClicked(ShortcutPreference preference) {
super.onSettingsClicked(preference);
showDialog(DIALOG_ID_EDIT_SHORTCUT);
showDialog(DialogEnums.EDIT_SHORTCUT);
}
private void updateSwitchBarToggleSwitch() {