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

Commit aaa066b6 authored by Alan Viverette's avatar Alan Viverette
Browse files

Add "experimental" subtitle to color correction and inversion 

BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
parent b7b686ca

res/layout/text_description_preference.xml

+2 −3
Original line number Diff line number Diff line
@@ -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" />

res/values/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -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>

res/xml/accessibility_daltonizer_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -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"

res/xml/accessibility_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public abstract class ToggleFeaturePreferenceFragment 
            @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);

            }