Merge "Add accessibility text contrast setting" into lmp-dev

10 files changed, 289 insertions, 103 deletions

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9f1279adaf56..bc069cab1200 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3678,6 +3678,14 @@ public final class Settings {
         public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password";
 
         /**
+         * Whether to draw text with high contrast while in accessibility mode.
+         *
+         * @hide
+         */
+        public static final String ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED =
+                "high_text_contrast_enabled";
+
+        /**
          * If injection of accessibility enhancing JavaScript screen-reader
          * is enabled.
          * <p>
@@ -4644,6 +4652,7 @@ public final class Settings {
             TOUCH_EXPLORATION_ENABLED,
             ACCESSIBILITY_ENABLED,
             ACCESSIBILITY_SPEAK_PASSWORD,
+            ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
             ACCESSIBILITY_CAPTIONING_ENABLED,
             ACCESSIBILITY_CAPTIONING_LOCALE,
             ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR,
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java
index d7d3c72ba940..910f8622004e 100644
--- a/core/java/android/view/GLES20Canvas.java
+++ b/core/java/android/view/GLES20Canvas.java
@@ -168,7 +168,15 @@ class GLES20Canvas extends HardwareCanvas {
         nSetViewport(mRenderer, width, height);
     }
 
-    private static native void nSetViewport(long renderer, int width, int height);
+    private static native void nSetViewport(long renderer,
+            int width, int height);
+
+    @Override
+    public void setHighContrastText(boolean highContrastText) {
+        nSetHighContrastText(mRenderer, highContrastText);
+    }
+
+    private static native void nSetHighContrastText(long renderer, boolean highContrastText);
 
     @Override
     public int onPreDraw(Rect dirty) {
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index fdbc61966127..a3e2c965ba10 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13746,6 +13746,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             int layerType = getLayerType();
 
             final HardwareCanvas canvas = renderNode.start(width, height);
+            canvas.setHighContrastText(mAttachInfo.mHighContrastText);
 
             try {
                 final HardwareLayer layer = getHardwareLayer();
@@ -19913,6 +19914,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         boolean mViewScrollChanged;
 
         /**
+         * Set to true if high contrast mode enabled
+         */
+        boolean mHighContrastText;
+
+        /**
          * Global to the view hierarchy used as a temporary for dealing with
          * x/y points in the transparent region computations.
          */
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index f3ad98878888..a8d3f99e8432 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -63,6 +63,7 @@ import android.view.View.MeasureSpec;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
+import android.view.accessibility.AccessibilityManager.HighTextContrastChangeListener;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.accessibility.IAccessibilityInteractionConnection;
@@ -313,6 +314,7 @@ public final class ViewRootImpl implements ViewParent,
     AccessibilityInteractionController mAccessibilityInteractionController;
 
     AccessibilityInteractionConnectionManager mAccessibilityInteractionConnectionManager;
+    HighContrastTextManager mHighContrastTextManager;
 
     SendWindowContentChangedAccessibilityEvent mSendWindowContentChangedAccessibilityEvent;
 
@@ -370,12 +372,15 @@ public final class ViewRootImpl implements ViewParent,
         mPreviousTransparentRegion = new Region();
         mFirst = true; // true for the first time the view is added
         mAdded = false;
+        mAttachInfo = new View.AttachInfo(mWindowSession, mWindow, display, this, mHandler, this);
         mAccessibilityManager = AccessibilityManager.getInstance(context);
         mAccessibilityInteractionConnectionManager =
             new AccessibilityInteractionConnectionManager();
         mAccessibilityManager.addAccessibilityStateChangeListener(
                 mAccessibilityInteractionConnectionManager);
-        mAttachInfo = new View.AttachInfo(mWindowSession, mWindow, display, this, mHandler, this);
+        mHighContrastTextManager = new HighContrastTextManager();
+        mAccessibilityManager.addHighTextContrastStateChangeListener(
+                mHighContrastTextManager);
         mViewConfiguration = ViewConfiguration.get(context);
         mDensity = context.getResources().getDisplayMetrics().densityDpi;
         mNoncompatDensity = context.getResources().getDisplayMetrics().noncompatDensityDpi;
@@ -2914,6 +2919,8 @@ public final class ViewRootImpl implements ViewParent,
         mAccessibilityInteractionConnectionManager.ensureNoConnection();
         mAccessibilityManager.removeAccessibilityStateChangeListener(
                 mAccessibilityInteractionConnectionManager);
+        mAccessibilityManager.removeHighTextContrastStateChangeListener(
+                mHighContrastTextManager);
         removeSendWindowContentChangedCallback();
 
         destroyHardwareRenderer();
@@ -6585,7 +6592,7 @@ public final class ViewRootImpl implements ViewParent,
         public void onAccessibilityStateChanged(boolean enabled) {
             if (enabled) {
                 ensureConnection();
-                if (mAttachInfo != null && mAttachInfo.mHasWindowFocus) {
+                if (mAttachInfo.mHasWindowFocus) {
                     mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
                     View focusedView = mView.findFocus();
                     if (focusedView != null && focusedView != mView) {
@@ -6599,14 +6606,12 @@ public final class ViewRootImpl implements ViewParent,
         }
 
         public void ensureConnection() {
-            if (mAttachInfo != null) {
-                final boolean registered =
+            final boolean registered =
                     mAttachInfo.mAccessibilityWindowId != AccessibilityNodeInfo.UNDEFINED_ITEM_ID;
-                if (!registered) {
-                    mAttachInfo.mAccessibilityWindowId =
+            if (!registered) {
+                mAttachInfo.mAccessibilityWindowId =
                         mAccessibilityManager.addAccessibilityInteractionConnection(mWindow,
                                 new AccessibilityInteractionConnection(ViewRootImpl.this));
-                }
             }
         }
 
@@ -6620,6 +6625,19 @@ public final class ViewRootImpl implements ViewParent,
         }
     }
 
+    final class HighContrastTextManager implements HighTextContrastChangeListener {
+        HighContrastTextManager() {
+            mAttachInfo.mHighContrastText = mAccessibilityManager.isHighTextContrastEnabled();
+        }
+        @Override
+        public void onHighTextContrastStateChanged(boolean enabled) {
+            mAttachInfo.mHighContrastText = enabled;
+
+            // Destroy Displaylists so they can be recreated with high contrast recordings
+            destroyHardwareResources();
+        }
+    }
+
     /**
      * This class is an interface this ViewAncestor provides to the
      * AccessibilityManagerService to the latter can interact with
diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index cbc38c666f4b..94e2c0ee3e66 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -18,6 +18,7 @@ package android.view.accessibility;
 
 import android.Manifest;
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.annotation.NonNull;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
@@ -76,6 +77,9 @@ public final class AccessibilityManager {
     public static final int STATE_FLAG_TOUCH_EXPLORATION_ENABLED = 0x00000002;
 
     /** @hide */
+    public static final int STATE_FLAG_HIGH_TEXT_CONTRAST_ENABLED = 0x00000004;
+
+    /** @hide */
     public static final int INVERSION_DISABLED = -1;
 
     /** @hide */
@@ -127,13 +131,19 @@ public final class AccessibilityManager {
 
     boolean mIsTouchExplorationEnabled;
 
+    boolean mIsHighTextContrastEnabled;
+
     private final CopyOnWriteArrayList<AccessibilityStateChangeListener>
             mAccessibilityStateChangeListeners = new CopyOnWriteArrayList<
                     AccessibilityStateChangeListener>();
 
     private final CopyOnWriteArrayList<TouchExplorationStateChangeListener>
             mTouchExplorationStateChangeListeners = new CopyOnWriteArrayList<
-                    TouchExplorationStateChangeListener>();
+            TouchExplorationStateChangeListener>();
+
+    private final CopyOnWriteArrayList<HighTextContrastChangeListener>
+            mHighTextContrastStateChangeListeners = new CopyOnWriteArrayList<
+            HighTextContrastChangeListener>();
 
     /**
      * Listener for the system accessibility state. To listen for changes to the
@@ -166,6 +176,24 @@ public final class AccessibilityManager {
         public void onTouchExplorationStateChanged(boolean enabled);
     }
 
+    /**
+     * Listener for the system high text contrast state. To listen for changes to
+     * the high text contrast state on the device, implement this interface and
+     * register it with the system by calling
+     * {@link #addHighTextContrastStateChangeListener}.
+     *
+     * @hide
+     */
+    public interface HighTextContrastChangeListener {
+
+        /**
+         * Called when the high text contrast enabled state changes.
+         *
+         * @param enabled Whether high text contrast is enabled.
+         */
+        public void onHighTextContrastStateChanged(boolean enabled);
+    }
+
     private final IAccessibilityManagerClient.Stub mClient =
             new IAccessibilityManagerClient.Stub() {
         public void setState(int state) {
@@ -262,6 +290,27 @@ public final class AccessibilityManager {
     }
 
     /**
+     * Returns if the high text contrast in the system is enabled.
+     * <p>
+     * <strong>Note:</strong> You need to query this only if you application is
+     * doing its own rendering and does not rely on the platform rendering pipeline.
+     * </p>
+     *
+     * @return True if high text contrast is enabled, false otherwise.
+     *
+     * @hide
+     */
+    public boolean isHighTextContrastEnabled() {
+        synchronized (mLock) {
+            IAccessibilityManager service = getServiceLocked();
+            if (service == null) {
+                return false;
+            }
+            return mIsHighTextContrastEnabled;
+        }
+    }
+
+    /**
      * Sends an {@link AccessibilityEvent}.
      *
      * @param event The event to send.
@@ -434,7 +483,7 @@ public final class AccessibilityManager {
      * @return True if successfully registered.
      */
     public boolean addAccessibilityStateChangeListener(
-            AccessibilityStateChangeListener listener) {
+            @NonNull AccessibilityStateChangeListener listener) {
         // Final CopyOnArrayList - no lock needed.
         return mAccessibilityStateChangeListeners.add(listener);
     }
@@ -446,7 +495,7 @@ public final class AccessibilityManager {
      * @return True if successfully unregistered.
      */
     public boolean removeAccessibilityStateChangeListener(
-            AccessibilityStateChangeListener listener) {
+            @NonNull AccessibilityStateChangeListener listener) {
         // Final CopyOnArrayList - no lock needed.
         return mAccessibilityStateChangeListeners.remove(listener);
     }
@@ -459,7 +508,7 @@ public final class AccessibilityManager {
      * @return True if successfully registered.
      */
     public boolean addTouchExplorationStateChangeListener(
-            TouchExplorationStateChangeListener listener) {
+            @NonNull TouchExplorationStateChangeListener listener) {
         // Final CopyOnArrayList - no lock needed.
         return mTouchExplorationStateChangeListeners.add(listener);
     }
@@ -471,12 +520,41 @@ public final class AccessibilityManager {
      * @return True if successfully unregistered.
      */
     public boolean removeTouchExplorationStateChangeListener(
-            TouchExplorationStateChangeListener listener) {
+            @NonNull TouchExplorationStateChangeListener listener) {
         // Final CopyOnArrayList - no lock needed.
         return mTouchExplorationStateChangeListeners.remove(listener);
     }
 
     /**
+     * Registers a {@link HighTextContrastChangeListener} for changes in
+     * the global high text contrast state of the system.
+     *
+     * @param listener The listener.
+     * @return True if successfully registered.
+     *
+     * @hide
+     */
+    public boolean addHighTextContrastStateChangeListener(
+            @NonNull HighTextContrastChangeListener listener) {
+        // Final CopyOnArrayList - no lock needed.
+        return mHighTextContrastStateChangeListeners.add(listener);
+    }
+
+    /**
+     * Unregisters a {@link HighTextContrastChangeListener}.
+     *
+     * @param listener The listener.
+     * @return True if successfully unregistered.
+     *
+     * @hide
+     */
+    public boolean removeHighTextContrastStateChangeListener(
+            @NonNull HighTextContrastChangeListener listener) {
+        // Final CopyOnArrayList - no lock needed.
+        return mHighTextContrastStateChangeListeners.remove(listener);
+    }
+
+    /**
      * Sets the current state and notifies listeners, if necessary.
      *
      * @param stateFlags The state flags.
@@ -485,13 +563,17 @@ public final class AccessibilityManager {
         final boolean enabled = (stateFlags & STATE_FLAG_ACCESSIBILITY_ENABLED) != 0;
         final boolean touchExplorationEnabled =
                 (stateFlags & STATE_FLAG_TOUCH_EXPLORATION_ENABLED) != 0;
+        final boolean highTextContrastEnabled =
+                (stateFlags & STATE_FLAG_HIGH_TEXT_CONTRAST_ENABLED) != 0;
 
         final boolean wasEnabled = mIsEnabled;
         final boolean wasTouchExplorationEnabled = mIsTouchExplorationEnabled;
+        final boolean wasHighTextContrastEnabled = mIsHighTextContrastEnabled;
 
         // Ensure listeners get current state from isZzzEnabled() calls.
         mIsEnabled = enabled;
         mIsTouchExplorationEnabled = touchExplorationEnabled;
+        mIsHighTextContrastEnabled = highTextContrastEnabled;
 
         if (wasEnabled != enabled) {
             mHandler.sendEmptyMessage(MyHandler.MSG_NOTIFY_ACCESSIBILITY_STATE_CHANGED);
@@ -500,6 +582,10 @@ public final class AccessibilityManager {
         if (wasTouchExplorationEnabled != touchExplorationEnabled) {
             mHandler.sendEmptyMessage(MyHandler.MSG_NOTIFY_EXPLORATION_STATE_CHANGED);
         }
+
+        if (wasHighTextContrastEnabled != highTextContrastEnabled) {
+            mHandler.sendEmptyMessage(MyHandler.MSG_NOTIFY_HIGH_TEXT_CONTRAST_STATE_CHANGED);
+        }
     }
 
     /**
@@ -600,9 +686,25 @@ public final class AccessibilityManager {
         }
     }
 
+    /**
+     * Notifies the registered {@link HighTextContrastChangeListener}s.
+     */
+    private void handleNotifyHighTextContrastStateChanged() {
+        final boolean isHighTextContrastEnabled;
+        synchronized (mLock) {
+            isHighTextContrastEnabled = mIsHighTextContrastEnabled;
+        }
+        final int listenerCount = mHighTextContrastStateChangeListeners.size();
+        for (int i = 0; i < listenerCount; i++) {
+            mHighTextContrastStateChangeListeners.get(i)
+                    .onHighTextContrastStateChanged(isHighTextContrastEnabled);
+        }
+    }
+
     private final class MyHandler extends Handler {
         public static final int MSG_NOTIFY_ACCESSIBILITY_STATE_CHANGED = 1;
         public static final int MSG_NOTIFY_EXPLORATION_STATE_CHANGED = 2;
+        public static final int MSG_NOTIFY_HIGH_TEXT_CONTRAST_STATE_CHANGED = 3;
 
         public MyHandler(Looper looper) {
             super(looper, null, false);
@@ -617,7 +719,11 @@ public final class AccessibilityManager {
 
                 case MSG_NOTIFY_EXPLORATION_STATE_CHANGED: {
                     handleNotifyTouchExplorationStateChanged();
-                }
+                } break;
+
+                case MSG_NOTIFY_HIGH_TEXT_CONTRAST_STATE_CHANGED: {
+                    handleNotifyHighTextContrastStateChanged();
+                } break;
             }
         }
     }
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index c352398e2354..8641e737ead0 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -100,6 +100,12 @@ static void android_view_GLES20Canvas_setViewport(JNIEnv* env, jobject clazz,
     renderer->setViewport(width, height);
 }
 
+static void android_view_GLES20Canvas_setHighContrastText(JNIEnv* env, jobject clazz,
+        jlong rendererPtr, jboolean highContrastText) {
+    DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr);
+    renderer->setHighContrastText(highContrastText);
+}
+
 static int android_view_GLES20Canvas_prepare(JNIEnv* env, jobject clazz,
         jlong rendererPtr, jboolean opaque) {
     DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr);
@@ -842,6 +848,7 @@ static JNINativeMethod gMethods[] = {
 
     { "nDestroyRenderer",   "(J)V",            (void*) android_view_GLES20Canvas_destroyRenderer },
     { "nSetViewport",       "(JII)V",          (void*) android_view_GLES20Canvas_setViewport },
+    { "nSetHighContrastText","(JZ)V",          (void*) android_view_GLES20Canvas_setHighContrastText },
     { "nPrepare",           "(JZ)I",           (void*) android_view_GLES20Canvas_prepare },
     { "nPrepareDirty",      "(JIIIIZ)I",       (void*) android_view_GLES20Canvas_prepareDirty },
     { "nFinish",            "(J)V",            (void*) android_view_GLES20Canvas_finish },
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 52117625a17d..ef4b26057c44 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -237,6 +237,9 @@ public class Canvas {
      */
     public void setViewport(int width, int height) {}
 
+    /** @hide */
+    public void setHighContrastText(boolean highContrastText) {}
+
     /**
      * @hide
      */
diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp
index ba5594af87c6..c7dc29bbcebd 100644
--- a/libs/hwui/DisplayListRenderer.cpp
+++ b/libs/hwui/DisplayListRenderer.cpp
@@ -31,10 +31,14 @@
 namespace android {
 namespace uirenderer {
 
-DisplayListRenderer::DisplayListRenderer():
-        mCaches(Caches::getInstance()), mDisplayListData(0),
-        mTranslateX(0.0f), mTranslateY(0.0f), mHasTranslate(false),
-        mRestoreSaveCount(-1) {
+DisplayListRenderer::DisplayListRenderer()
+    : mCaches(Caches::getInstance())
+    , mDisplayListData(0)
+    , mTranslateX(0.0f)
+    , mTranslateY(0.0f)
+    , mHasTranslate(false)
+    , mHighContrastText(false)
+    , mRestoreSaveCount(-1) {
 }
 
 DisplayListRenderer::~DisplayListRenderer() {
@@ -367,6 +371,16 @@ status_t DisplayListRenderer::drawPosText(const char* text, int bytesCount, int
     return DrawGlInfo::kStatusDone;
 }
 
+static void simplifyPaint(int color, SkPaint* paint) {
+    paint->setColor(color);
+    paint->setShader(NULL);
+    paint->setColorFilter(NULL);
+    paint->setLooper(NULL);
+    paint->setStrokeWidth(4 + 0.04 * paint->getTextSize());
+    paint->setStrokeJoin(SkPaint::kRound_Join);
+    paint->setLooper(NULL);
+}
+
 status_t DisplayListRenderer::drawText(const char* text, int bytesCount, int count,
         float x, float y, const float* positions, const SkPaint* paint,
         float totalAdvance, const Rect& bounds, DrawOpMode drawOpMode) {
@@ -375,11 +389,34 @@ status_t DisplayListRenderer::drawText(const char* text, int bytesCount, int cou
 
     text = refText(text, bytesCount);
     positions = refBuffer<float>(positions, count * 2);
-    paint = refPaint(paint);
 
-    DrawOp* op = new (alloc()) DrawTextOp(text, bytesCount, count,
-            x, y, positions, paint, totalAdvance, bounds);
-    addDrawOp(op);
+    if (CC_UNLIKELY(mHighContrastText)) {
+        // high contrast draw path
+        int color = paint->getColor();
+        int channelSum = SkColorGetR(color) + SkColorGetG(color) + SkColorGetB(color);
+        bool darken = channelSum < (128 * 3);
+
+        // outline
+        SkPaint* outlinePaint = copyPaint(paint);
+        simplifyPaint(darken ? SK_ColorWHITE : SK_ColorBLACK, outlinePaint);
+        outlinePaint->setStyle(SkPaint::kStrokeAndFill_Style);
+        addDrawOp(new (alloc()) DrawTextOp(text, bytesCount, count,
+                x, y, positions, outlinePaint, totalAdvance, bounds)); // bounds?
+
+        // inner
+        SkPaint* innerPaint = copyPaint(paint);
+        simplifyPaint(darken ? SK_ColorBLACK : SK_ColorWHITE, innerPaint);
+        innerPaint->setStyle(SkPaint::kFill_Style);
+        addDrawOp(new (alloc()) DrawTextOp(text, bytesCount, count,
+                x, y, positions, innerPaint, totalAdvance, bounds));
+    } else {
+        // standard draw path
+        paint = refPaint(paint);
+
+        DrawOp* op = new (alloc()) DrawTextOp(text, bytesCount, count,
+                x, y, positions, paint, totalAdvance, bounds);
+        addDrawOp(op);
+    }
     return DrawGlInfo::kStatusDone;
 }
 
diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
index 2b2d40264681..d1d857299e86 100644
--- a/libs/hwui/DisplayListRenderer.h
+++ b/libs/hwui/DisplayListRenderer.h
@@ -154,6 +154,9 @@ public:
     // TODO: rename for consistency
     virtual status_t callDrawGLFunction(Functor* functor, Rect& dirty);
 
+    void setHighContrastText(bool highContrastText) {
+        mHighContrastText = highContrastText;
+    }
 private:
     void insertRestoreToCount();
     void insertTranslate();
@@ -201,9 +204,7 @@ private:
     }
 
     inline const SkPaint* refPaint(const SkPaint* paint) {
-        if (!paint) {
-            return paint;
-        }
+        if (!paint) return NULL;
 
         const SkPaint* paintCopy = mPaintMap.valueFor(paint);
         if (paintCopy == NULL || paintCopy->getGenerationID() != paint->getGenerationID()) {
@@ -216,6 +217,14 @@ private:
         return paintCopy;
     }
 
+    inline SkPaint* copyPaint(const SkPaint* paint) {
+        if (!paint) return NULL;
+        SkPaint* paintCopy = new SkPaint(*paint);
+        mDisplayListData->paints.add(paintCopy);
+
+        return paintCopy;
+    }
+
     inline const SkRegion* refRegion(const SkRegion* region) {
         if (!region) {
             return region;
@@ -271,6 +280,7 @@ private:
     float mTranslateX;
     float mTranslateY;
     bool mHasTranslate;
+    bool mHighContrastText;
 
     int mRestoreSaveCount;
 
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index ee7eb9f2136f..07bb71384175 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1443,6 +1443,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
         somthingChanged |= readEnabledAccessibilityServicesLocked(userState);
         somthingChanged |= readTouchExplorationGrantedAccessibilityServicesLocked(userState);
         somthingChanged |= readTouchExplorationEnabledSettingLocked(userState);
+        somthingChanged |= readHighTextContrastEnabledSettingLocked(userState);
         somthingChanged |= readEnhancedWebAccessibilityEnabledChangedLocked(userState);
         somthingChanged |= readDisplayMagnificationEnabledSettingLocked(userState);
         somthingChanged |= readDisplayColorAdjustmentSettingsLocked(userState);
@@ -1506,6 +1507,18 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
         return displayAdjustmentsEnabled;
     }
 
+    private boolean readHighTextContrastEnabledSettingLocked(UserState userState) {
+        final boolean highTextContrastEnabled = Settings.Secure.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0,
+                userState.mUserId) == 1;
+        if (highTextContrastEnabled != userState.mIsTextHighContrastEnabled) {
+            userState.mIsTextHighContrastEnabled = highTextContrastEnabled;
+            return true;
+        }
+        return false;
+    }
+
     private void updateTouchExplorationLocked(UserState userState) {
         boolean enabled = false;
         final int serviceCount = userState.mBoundServices.size();
@@ -3586,6 +3599,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
 
         public boolean mIsAccessibilityEnabled;
         public boolean mIsTouchExplorationEnabled;
+        public boolean mIsTextHighContrastEnabled;
         public boolean mIsEnhancedWebAccessibilityEnabled;
         public boolean mIsDisplayMagnificationEnabled;
         public boolean mIsFilterKeyEventsEnabled;
@@ -3622,6 +3636,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
             if (mIsAccessibilityEnabled && mIsTouchExplorationEnabled) {
                 clientState |= AccessibilityManager.STATE_FLAG_TOUCH_EXPLORATION_ENABLED;
             }
+            if (mIsTextHighContrastEnabled) {
+                clientState |= AccessibilityManager.STATE_FLAG_HIGH_TEXT_CONTRAST_ENABLED;
+            }
             return clientState;
         }
 
@@ -3687,9 +3704,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
 
         private final Uri mDisplayDaltonizerEnabledUri = Settings.Secure.getUriFor(
                 Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+
         private final Uri mDisplayDaltonizerUri = Settings.Secure.getUriFor(
                 Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER);
 
+        private final Uri mHighTextContrastUri = Settings.Secure.getUriFor(
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED);
+
         public AccessibilityContentObserver(Handler handler) {
             super(handler);
         }
@@ -3714,94 +3735,55 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
                     mDisplayDaltonizerEnabledUri, false, this, UserHandle.USER_ALL);
             contentResolver.registerContentObserver(
                     mDisplayDaltonizerUri, false, this, UserHandle.USER_ALL);
+            contentResolver.registerContentObserver(
+                    mHighTextContrastUri, false, this, UserHandle.USER_ALL);
         }
 
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-            if (mAccessibilityEnabledUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readAccessibilityEnabledSettingLocked(userState)) {
-                            onUserStateChangedLocked(userState);
-                        }
-                    }
+            synchronized (mLock) {
+                // Profiles share the accessibility state of the parent. Therefore,
+                // we are checking for changes only the parent settings.
+                UserState userState = getCurrentUserStateLocked();
+
+                // We will update when the automation service dies.
+                if (userState.mUiAutomationService != null) {
+                    return;
                 }
-            } else if (mTouchExplorationEnabledUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readTouchExplorationEnabledSettingLocked(userState)) {
-                            onUserStateChangedLocked(userState);
-                        }
+
+                if (mAccessibilityEnabledUri.equals(uri)) {
+                    if (readAccessibilityEnabledSettingLocked(userState)) {
+                        onUserStateChangedLocked(userState);
                     }
-                }
-            } else if (mDisplayMagnificationEnabledUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readDisplayMagnificationEnabledSettingLocked(userState)) {
-                            onUserStateChangedLocked(userState);
-                        }
+                } else if (mTouchExplorationEnabledUri.equals(uri)) {
+                    if (readTouchExplorationEnabledSettingLocked(userState)) {
+                        onUserStateChangedLocked(userState);
                     }
-                }
-            } else if (mEnabledAccessibilityServicesUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readEnabledAccessibilityServicesLocked(userState)) {
-                            onUserStateChangedLocked(userState);
-                        }
+                } else if (mDisplayMagnificationEnabledUri.equals(uri)) {
+                    if (readDisplayMagnificationEnabledSettingLocked(userState)) {
+                        onUserStateChangedLocked(userState);
                     }
-                }
-            } else if (mTouchExplorationGrantedAccessibilityServicesUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readTouchExplorationGrantedAccessibilityServicesLocked(userState)) {
-                            onUserStateChangedLocked(userState);
-                        }
+                } else if (mEnabledAccessibilityServicesUri.equals(uri)) {
+                    if (readEnabledAccessibilityServicesLocked(userState)) {
+                        onUserStateChangedLocked(userState);
                     }
-                }
-            } else if (mEnhancedWebAccessibilityUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readEnhancedWebAccessibilityEnabledChangedLocked(userState)) {
-                            onUserStateChangedLocked(userState);
-                        }
+                } else if (mTouchExplorationGrantedAccessibilityServicesUri.equals(uri)) {
+                    if (readTouchExplorationGrantedAccessibilityServicesLocked(userState)) {
+                        onUserStateChangedLocked(userState);
                     }
-                }
-            } else if (mDisplayInversionEnabledUri.equals(uri)
-                    || mDisplayDaltonizerEnabledUri.equals(uri)
-                    || mDisplayDaltonizerUri.equals(uri)) {
-                synchronized (mLock) {
-                    // Profiles share the accessibility state of the parent. Therefore,
-                    // we are checking for changes only the parent settings.
-                    UserState userState = getCurrentUserStateLocked();
-                    // We will update when the automation service dies.
-                    if (userState.mUiAutomationService == null) {
-                        if (readDisplayColorAdjustmentSettingsLocked(userState)) {
-                            updateDisplayColorAdjustmentSettingsLocked(userState);
-                        }
+                } else if (mEnhancedWebAccessibilityUri.equals(uri)) {
+                    if (readEnhancedWebAccessibilityEnabledChangedLocked(userState)) {
+                        onUserStateChangedLocked(userState);
+                    }
+                } else if (mDisplayInversionEnabledUri.equals(uri)
+                        || mDisplayDaltonizerEnabledUri.equals(uri)
+                        || mDisplayDaltonizerUri.equals(uri)) {
+                    if (readDisplayColorAdjustmentSettingsLocked(userState)) {
+                        updateDisplayColorAdjustmentSettingsLocked(userState);
+                    }
+                } else if (mHighTextContrastUri.equals(uri)) {
+                    if (readHighTextContrastEnabledSettingLocked(userState)) {
+                        onUserStateChangedLocked(userState);
                     }
                 }
             }