Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6821b6be authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "slice-highlight" into sc-v2-dev 

* changes:
  Add highlight menu keys for all toggle pref controllers and custom slices
  Support slice deep links highlighting menu entries
parents faf0721f 2989c50a

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;





import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;





/**

/**
@@ -57,4 +58,9 @@ public class AccessibilityShortcutPreferenceController extends TogglePreferenceC 
    public int getAvailabilityStatus() {

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return AVAILABLE;

    }

    }



    @Override

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_accessibility;

    }

}
 
}

src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Context; 
import android.provider.Settings;

import android.provider.Settings;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityManager;





import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.accessibility.AccessibilityUtils;

import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -98,6 +99,11 @@ public class AccessibilitySlicePreferenceController extends TogglePreferenceCont 
        return true;

        return true;

    }

    }





    @Override

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_accessibility;

    }



    private AccessibilityServiceInfo getAccessibilityServiceInfo() {

    private AccessibilityServiceInfo getAccessibilityServiceInfo() {

        final AccessibilityManager accessibilityManager = mContext.getSystemService(

        final AccessibilityManager accessibilityManager = mContext.getSystemService(

                AccessibilityManager.class);

                AccessibilityManager.class);

src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.text.TextUtils; 




import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;





public class DisableAnimationsPreferenceController extends TogglePreferenceController {

public class DisableAnimationsPreferenceController extends TogglePreferenceController {
@@ -71,4 +72,9 @@ public class DisableAnimationsPreferenceController extends TogglePreferenceContr 
    public int getAvailabilityStatus() {

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return AVAILABLE;

    }

    }



    @Override

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_accessibility;

    }

}
 
}

src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.graphics.fonts.FontStyle;

import android.graphics.fonts.FontStyle;

import android.provider.Settings;

import android.provider.Settings;





import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;





/** PreferenceController for displaying all text in bold. */

/** PreferenceController for displaying all text in bold. */
@@ -47,4 +48,9 @@ public class FontWeightAdjustmentPreferenceController extends TogglePreferenceCo 
        return Settings.Secure.putInt(mContext.getContentResolver(),

        return Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, (isChecked ? BOLD_TEXT_ADJUSTMENT : 0));

                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, (isChecked ? BOLD_TEXT_ADJUSTMENT : 0));

    }

    }



    @Override

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_accessibility;

    }

}
 
}

src/com/android/settings/accessibility/HighTextContrastPreferenceController.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.accessibility; 
import android.content.Context;

import android.content.Context;

import android.provider.Settings;

import android.provider.Settings;





import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;





public class HighTextContrastPreferenceController extends TogglePreferenceController {

public class HighTextContrastPreferenceController extends TogglePreferenceController {
@@ -43,4 +44,9 @@ public class HighTextContrastPreferenceController extends TogglePreferenceContro 
        return Settings.Secure.putInt(mContext.getContentResolver(),

        return Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, (isChecked ? 1 : 0));

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, (isChecked ? 1 : 0));

    }

    }



    @Override

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_accessibility;

    }

}
 
}