AdvancedDisplay: Rename Negative to Accessibility
* Samsung now supports many more modes than just inverted colors
* Add strings for these extra modes while we're at it
Change-Id: If2a469c994658d521d98b91adec1a19badb8092f
diff --git a/AdvancedDisplay/res/values/arrays.xml b/AdvancedDisplay/res/values/arrays.xml
index 2e2eeb3..ccdcd62 100644
--- a/AdvancedDisplay/res/values/arrays.xml
+++ b/AdvancedDisplay/res/values/arrays.xml
@@ -38,12 +38,12 @@
<item>7</item>
</string-array>
- <string-array name="mdnie_negative_entries" translatable="false">
- <item>@string/mdnie_inverse_normal</item>
- <item>@string/mdnie_inverse_inverse</item>
+ <string-array name="mdnie_accessibility_entries" translatable="false">
+ <item>@string/mdnie_accessibility_normal</item>
+ <item>@string/mdnie_accessibility_inverse</item>
</string-array>
- <string-array name="mdnie_negative_entries_values" translatable="false">
+ <string-array name="mdnie_accessibility_entries_values" translatable="false">
<item>0</item>
<item>1</item>
</string-array>
diff --git a/AdvancedDisplay/res/values/config.xml b/AdvancedDisplay/res/values/config.xml
index 1bb5c1a..b20c248 100644
--- a/AdvancedDisplay/res/values/config.xml
+++ b/AdvancedDisplay/res/values/config.xml
@@ -20,6 +20,6 @@
<!-- MDNIE -->
<string name="mdnie_scenario_sysfs_file" translatable="false">"/sys/class/mdnie/mdnie/scenario"</string>
- <string name="mdnie_negative_sysfs_file" translatable="false">"/sys/class/mdnie/mdnie/negative"</string>
+ <string name="mdnie_accessibility_sysfs_file" translatable="false">"/sys/class/mdnie/mdnie/negative"</string>
</resources>
diff --git a/AdvancedDisplay/res/values/strings.xml b/AdvancedDisplay/res/values/strings.xml
index 57ee1c4..ca4b5f1 100644
--- a/AdvancedDisplay/res/values/strings.xml
+++ b/AdvancedDisplay/res/values/strings.xml
@@ -25,8 +25,8 @@
<!-- mDNIe -->
<string name="mdnie_scenario_title_head">Scenario</string>
<string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
- <string name="mdnie_negative_title_head">Negative mode</string>
- <string name="mdnie_negative_summary_head">Enable/disable inverted colors</string>
+ <string name="mdnie_accessibility_title_head">Accessibility mode</string>
+ <string name="mdnie_accessibility_summary_head">Set the mDNIe accessibility mode</string>
<!-- Scenario names -->
<string name="mdnie_scenario_ui">LineageOS (default)</string>
@@ -42,9 +42,13 @@
<string name="mdnie_scenario_email">E-mail</string>
<string name="mdnie_scenario_tdmb">Digital television</string>
- <!-- Inverse mode names -->
- <string name="mdnie_inverse_normal">Normal</string>
- <string name="mdnie_inverse_inverse">Inverted</string>
+ <!-- Accessibility mode names -->
+ <string name="mdnie_accessibility_normal">Normal</string>
+ <string name="mdnie_accessibility_inverse">Inverted</string>
+ <string name="mdnie_accessibility_color_blind">Color blind</string>
+ <string name="mdnie_accessibility_screen_curtain">Screen curtain</string>
+ <string name="mdnie_accessibility_grayscale">Gray</string>
+ <string name="mdnie_accessibility_gray_negative">Gray inverted</string>
<!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
<string name="summary_empty" translatable="false"></string>
diff --git a/AdvancedDisplay/res/xml/screen_preferences.xml b/AdvancedDisplay/res/xml/screen_preferences.xml
index 492f5a4..5fb1ab9 100644
--- a/AdvancedDisplay/res/xml/screen_preferences.xml
+++ b/AdvancedDisplay/res/xml/screen_preferences.xml
@@ -14,13 +14,13 @@
android:entryValues="@array/mdnie_scenario_entries_values"
android:defaultValue="0" />
- <!-- mDNIe Negative mode -->
- <org.lineageos.settings.device.mDNIeNegative
- android:key="mdnie_negative"
- android:title="@string/mdnie_negative_title_head"
- android:summary="@string/mdnie_negative_summary_head"
- android:entries="@array/mdnie_negative_entries"
- android:entryValues="@array/mdnie_negative_entries_values"
+ <!-- mDNIe Accessibility mode -->
+ <org.lineageos.settings.device.mDNIeAccessibility
+ android:key="mdnie_accessibility"
+ android:title="@string/mdnie_accessibility_title_head"
+ android:summary="@string/mdnie_accessibility_summary_head"
+ android:entries="@array/mdnie_accessibility_entries"
+ android:entryValues="@array/mdnie_accessibility_entries_values"
android:defaultValue="0" />
</PreferenceCategory>
diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
index 7046e30..c27e456 100644
--- a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
@@ -28,7 +28,7 @@
public class AdvancedDisplayFragment extends PreferenceFragment {
private mDNIeScenario mmDNIeScenario;
- private mDNIeNegative mmDNIeNegative;
+ private mDNIeAccessibility mmDNIeAccessibility;
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -43,9 +43,9 @@
mmDNIeScenario.setEnabled(
FileUtils.isFileWritable(res.getString(R.string.mdnie_scenario_sysfs_file)));
- mmDNIeNegative = (mDNIeNegative) findPreference(Constants.KEY_MDNIE_NEGATIVE);
- mmDNIeNegative.setEnabled(
- FileUtils.isFileWritable(res.getString(R.string.mdnie_negative_sysfs_file)));
+ mmDNIeAccessibility = (mDNIeAccessibility) findPreference(Constants.KEY_MDNIE_ACCESSIBILITY);
+ mmDNIeAccessibility.setEnabled(
+ FileUtils.isFileWritable(res.getString(R.string.mdnie_accessibility_sysfs_file)));
}
@Override
diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java b/AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java
index 36a4270..9ab84cf 100644
--- a/AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java
@@ -26,6 +26,6 @@
@Override
public void onReceive(Context context, Intent intent) {
mDNIeScenario.restore(context);
- mDNIeNegative.restore(context);
+ mDNIeAccessibility.restore(context);
}
}
diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/Constants.java b/AdvancedDisplay/src/org/lineageos/settings/device/Constants.java
index 372cf50..56949ff 100644
--- a/AdvancedDisplay/src/org/lineageos/settings/device/Constants.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/Constants.java
@@ -18,5 +18,5 @@
public class Constants {
static final String KEY_MDNIE_SCENARIO = "mdnie_scenario";
- static final String KEY_MDNIE_NEGATIVE = "mdnie_negative";
+ static final String KEY_MDNIE_ACCESSIBILITY = "mdnie_accessibility";
}
diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeNegative.java b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java
similarity index 82%
rename from AdvancedDisplay/src/org/lineageos/settings/device/mDNIeNegative.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java
index 25d4199..2d931d1 100644
--- a/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeNegative.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java
@@ -27,14 +27,14 @@
import org.lineageos.internal.util.FileUtils;
-public class mDNIeNegative extends ListPreference implements OnPreferenceChangeListener {
+public class mDNIeAccessibility extends ListPreference implements OnPreferenceChangeListener {
private static String FILE = null;
- public mDNIeNegative(Context context, AttributeSet attrs) {
+ public mDNIeAccessibility(Context context, AttributeSet attrs) {
super(context, attrs);
this.setOnPreferenceChangeListener(this);
- FILE = context.getResources().getString(R.string.mdnie_negative_sysfs_file);
+ FILE = context.getResources().getString(R.string.mdnie_accessibility_sysfs_file);
}
/**
@@ -42,13 +42,13 @@
* @param context The context to read the SharedPreferences from
*/
public static void restore(Context context) {
- FILE = context.getResources().getString(R.string.mdnie_negative_sysfs_file);
+ FILE = context.getResources().getString(R.string.mdnie_accessibility_sysfs_file);
if (!FileUtils.isFileWritable(FILE)) {
return;
}
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
- FileUtils.writeLine(FILE, sharedPrefs.getString(Constants.KEY_MDNIE_NEGATIVE, "0"));
+ FileUtils.writeLine(FILE, sharedPrefs.getString(Constants.KEY_MDNIE_ACCESSIBILITY, "0"));
}
public boolean onPreferenceChange(Preference preference, Object newValue) {