DevicePartes: Update Glove Mode drawable and strings
diff --git a/DeviceParts/AndroidManifest.xml b/DeviceParts/AndroidManifest.xml
index 9200e21..7828f1b 100644
--- a/DeviceParts/AndroidManifest.xml
+++ b/DeviceParts/AndroidManifest.xml
@@ -76,7 +76,7 @@
</receiver>
<service
android:name="org.omnirom.device.GloveModeTileService"
- android:icon="@drawable/ic_hbm_tile"
+ android:icon="@drawable/ic_glove_tile"
android:label="@string/tile_glove_mode"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
diff --git a/DeviceParts/res/drawable/ic_glove_tile.xml b/DeviceParts/res/drawable/ic_glove_tile.xml
new file mode 100644
index 0000000..b69529e
--- /dev/null
+++ b/DeviceParts/res/drawable/ic_glove_tile.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24.0dip"
+ android:width="24.0dip"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path android:fillColor="#ff000000" android:pathData="M18.2638,12.94 L15.0238,11.32 A5.44892,5.44892,0,0,0,17.1438,7 A5.5,5.5,0,1,0,9.1438,11.89 L9.1438,15.15 L7.3038,14.76 L7.2038,14.74 A1.58226,1.58226,0,0,0,6.8838,14.71 A1.98311,1.98311,0,0,0,5.4738,15.3 L4.0738,16.72 L9.1638,21.81 A2.31462,2.31462,0,0,0,10.8138,22.5 L17.1138,22.5 A1.98854,1.98854,0,0,0,19.0838,20.83 L19.8838,16.12 A2.99226,2.99226,0,0,0,18.2638,12.94 Z M17.9138,15.79 L17.1138,20.5 L10.8138,20.5 A0.369,0.369,0,0,1,10.5738,20.4 L6.8938,16.72 L11.1438,17.61 L11.1438,7 A0.5,0.5,0,0,1,12.1438,7 L12.1438,13 L13.9038,13 L17.3638,14.73 A1.00676,1.00676,0,0,1,17.9138,15.79 Z M8.14379,7 A3.5,3.5,0,0,1,15.1438,7 A3.46426,3.46426,0,0,1,14.1438,9.44 L14.1438,7 A2.5,2.5,0,0,0,9.1438,7 L9.1438,9.44 A3.46426,3.46426,0,0,1,8.14379,7 Z" />
+</vector>
\ No newline at end of file
diff --git a/DeviceParts/res/drawable/ic_hbm_tile.xml b/DeviceParts/res/drawable/ic_hbm_tile.xml
deleted file mode 100644
index 95cf546..0000000
--- a/DeviceParts/res/drawable/ic_hbm_tile.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path android:fillColor="#fff" android:pathData="M7,17H4C2.38,17 0.96,15.74 0.76,14.14L0.26,11.15C0.15,10.3 0.39,9.5 0.91,8.92C1.43,8.34 2.19,8 3,8H9C9.83,8 10.58,8.35 11.06,8.96C11.17,9.11 11.27,9.27 11.35,9.45C11.78,9.36 12.22,9.36 12.64,9.45C12.72,9.27 12.82,9.11 12.94,8.96C13.41,8.35 14.16,8 15,8H21C21.81,8 22.57,8.34 23.09,8.92C23.6,9.5 23.84,10.3 23.74,11.11L23.23,14.18C23.04,15.74 21.61,17 20,17H17C15.44,17 13.92,15.81 13.54,14.3L12.64,11.59C12.26,11.31 11.73,11.31 11.35,11.59L10.43,14.37C10.07,15.82 8.56,17 7,17Z" />
-</vector>
diff --git a/DeviceParts/res/values/strings.xml b/DeviceParts/res/values/strings.xml
index 5322ecb..7d5917e 100644
--- a/DeviceParts/res/values/strings.xml
+++ b/DeviceParts/res/values/strings.xml
@@ -31,8 +31,8 @@
<string name="screen_title">Screen Sensitivity</string>
<string name="srgb_mode_summary"></string>
<string name="srgb_mode_title">sRGB mode</string>
- <string name="glove_mode_summary"></string>
- <string name="glove_mode_title">High Touch Sensitivity</string>
+ <string name="glove_mode_summary">Increase touch sensitivity when wearing gloves</string>
+ <string name="glove_mode_title">Glove mode</string>
<string name="hbm_mode_summary"></string>
<string name="hbm_mode_title">High brightness mode</string>
<string name="adaptive_mode_title">Adaptive mode</string>
@@ -113,7 +113,7 @@
<string name="panel_category_title">Panel modes</string>
<string name="panel_category_summary">Modes for panel color correction</string>
<string name="off_mode_title">Off</string>
- <string name="tile_glove_mode">High Touch Sensitivity</string>
+ <string name="tile_glove_mode">Glove mode</string>
<string name="tile_panel_mode">Panel modes</string>
<string name="tile_hbm_mode">High brightness modes</string>
<string name="wake_entry">Wakeup</string>
diff --git a/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java b/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java
index 30b4dcc..0fb4950 100644
--- a/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java
+++ b/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java
@@ -50,7 +50,7 @@
}
public static boolean isCurrentlyEnabled(Context context) {
- return Utils.getFileValueAsBoolean(getFile(), false);
+ return Utils.getLineValueAsBoolean(getFile(), true);
}
@Override
diff --git a/DeviceParts/src/org/omnirom/device/Utils.java b/DeviceParts/src/org/omnirom/device/Utils.java
index 389246f..96ead59 100644
--- a/DeviceParts/src/org/omnirom/device/Utils.java
+++ b/DeviceParts/src/org/omnirom/device/Utils.java
@@ -94,6 +94,14 @@
return defValue;
}
+ public static boolean getLineValueAsBoolean(String filename, boolean defValue) {
+ String fileValue = readLine(filename);
+ if(fileValue!=null){
+ return (fileValue.equals("Glove Mode: On")?true:false);
+ }
+ return defValue;
+ }
+
public static String getFileValue(String filename, String defValue) {
String fileValue = readLine(filename);
if(fileValue!=null){