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

Add "experimental" subtitle to color correction and inversion

Browse Source 
BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
This commit is contained in:
Alan Viverette
2014-08-19 17:37:16 -07:00
parent b7b686cadf
commit aaa066b66d
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/text_description_preference.xml
View File

@@ -16,9 +16,8 @@
<TextView <TextView
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:padding="16dip" /> android:padding="16dip" />

6
res/values/strings.xml
View File

@@ -3570,8 +3570,12 @@
<string name="accessibility_long_press_timeout_preference_title">Touch &amp; hold delay</string> <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] --> <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
<string name="accessibility_display_inversion_preference_title">Color inversion</string> <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] --> <!-- 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] --> <!-- 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> <string name="enable_quick_setting">Show in Quick Settings</string>

6
res/xml/accessibility_daltonizer_settings.xml
View File

@@ -17,6 +17,12 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/accessibility_display_daltonizer_preference_title" > 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 <ListPreference
android:entries="@array/daltonizer_type_entries" android:entries="@array/daltonizer_type_entries"
android:entryValues="@array/daltonizer_type_values" android:entryValues="@array/daltonizer_type_values"

1
res/xml/accessibility_settings.xml
View File

@@ -86,6 +86,7 @@
<SwitchPreference <SwitchPreference
android:key="toggle_inversion_preference" android:key="toggle_inversion_preference"
android:title="@string/accessibility_display_inversion_preference_title" android:title="@string/accessibility_display_inversion_preference_title"
android:summary="@string/accessibility_display_inversion_preference_subtitle"
android:persistent="false" /> android:persistent="false" />
<PreferenceScreen <PreferenceScreen
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment" android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"

4
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -55,10 +55,10 @@ public abstract class ToggleFeaturePreferenceFragment
getActivity()); getActivity());
setPreferenceScreen(preferenceScreen); setPreferenceScreen(preferenceScreen);
mSummaryPreference = new Preference(getActivity()) { mSummaryPreference = new Preference(getActivity()) {
@Override @Override
protected void onBindView(View view) { protected void onBindView(View view) {
super.onBindView(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()); summaryView.setText(getSummary());
sendAccessibilityEvent(summaryView); sendAccessibilityEvent(summaryView);
} }