From aaa066b66d4c8acf8931e624cf81376ac35d358e Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 19 Aug 2014 17:37:16 -0700
Subject: [PATCH] Add "experimental" subtitle to color correction and inversion

BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
---
 res/layout/text_description_preference.xml                  | 5 ++---
 res/values/strings.xml                                      | 6 +++++-
 res/xml/accessibility_daltonizer_settings.xml               | 6 ++++++
 res/xml/accessibility_settings.xml                          | 1 +
 .../accessibility/ToggleFeaturePreferenceFragment.java      | 4 ++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/res/layout/text_description_preference.xml b/res/layout/text_description_preference.xml
index 78eb02aa2a4..d71f078b236 100644
--- a/res/layout/text_description_preference.xml
+++ b/res/layout/text_description_preference.xml
@@ -16,9 +16,8 @@
 
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/summary"
+    android:id="@android:id/summary"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textColor="?android:attr/textColorSecondary"
+    android:textAppearance="@android:style/TextAppearance.Material.Body1"
     android:padding="16dip" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cf3abf93c92..34e93910091 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3570,8 +3570,12 @@
     <string name="accessibility_long_press_timeout_preference_title">Touch &amp; hold delay</string>
     <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
     <string name="accessibility_display_inversion_preference_title">Color inversion</string>
+    <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_display_inversion_preference_subtitle">(Experimental) May affect performance</string>
     <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_display_daltonizer_preference_title">Color space correction</string>
+    <string name="accessibility_display_daltonizer_preference_title">Color correction</string>
+    <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_display_daltonizer_preference_subtitle">This feature is experimental and may affect performance.</string>
 
     <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
     <string name="enable_quick_setting">Show in Quick Settings</string>
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 30a5444bd42..62c0dfc5f0d 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -17,6 +17,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/accessibility_display_daltonizer_preference_title" >
 
+    <Preference
+        android:summary="@string/accessibility_display_daltonizer_preference_subtitle"
+        android:layout="@layout/text_description_preference"
+        android:persistent="false"
+        android:selectable="false" />
+
     <ListPreference
         android:entries="@array/daltonizer_type_entries"
         android:entryValues="@array/daltonizer_type_values"
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index a87007444e3..d2d7711aec7 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -86,6 +86,7 @@
         <SwitchPreference
             android:key="toggle_inversion_preference"
             android:title="@string/accessibility_display_inversion_preference_title"
+            android:summary="@string/accessibility_display_inversion_preference_subtitle"
             android:persistent="false" />
         <PreferenceScreen
             android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 9fe70df00f1..b23035bff5d 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -55,10 +55,10 @@ public abstract class ToggleFeaturePreferenceFragment
                 getActivity());
         setPreferenceScreen(preferenceScreen);
         mSummaryPreference = new Preference(getActivity()) {
-                @Override
+            @Override
             protected void onBindView(View view) {
                 super.onBindView(view);
-                TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                final TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
                 summaryView.setText(getSummary());
                 sendAccessibilityEvent(summaryView);
             }