From d9c4044722698a2a10576d09a4674b1ea6495ec7 Mon Sep 17 00:00:00 2001
From: Leon Liao <leonliao@google.com>
Date: Fri, 7 Dec 2018 11:08:43 +0800
Subject: [PATCH] Fix content timeout item misorder in Display category in A11y
 Settings

A11y Content timeout item is disordered by program while device supports HWC
accelerated color transform. Add code to fix its order with present resource order.

Bug: 119283926
Test: atest AccessibilitySettingsTest
Test: make RunSettingsRoboTests
Change-Id: I5e8bff2347353d2c4fe9aa550d7efaa613bf2a90
---
 .../android/settings/accessibility/AccessibilitySettings.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index d6590fa041f..76be66db123 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -667,6 +667,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
                     mToggleInversionPreference.getOrder() + 1);
             mToggleDisableAnimationsPreference.setOrder(
                     mToggleLargePointerIconPreference.getOrder() + 1);
+            findPreference(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE).setOrder(
+                    mToggleDisableAnimationsPreference.getOrder() + 1);
             mToggleInversionPreference.setSummary(R.string.summary_empty);
             displayCategory.addPreference(mToggleInversionPreference);
             displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);