diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-11-07 21:59:05 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-11-07 21:59:05 +0100 |
| commit | eb35311cd0f429ac6c1950d6dac326e365aacbd5 (patch) | |
| tree | 9230405c49b2b1016b61f580a9f4cff2099e3817 /src/main/res | |
| parent | 1709346db447004322e4f3cde1be44be52451b4f (diff) | |
show warning in account details when data saver is enabled
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 15 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index cfa07f65a..808834d22 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -178,7 +178,7 @@ </RelativeLayout> <RelativeLayout - android:id="@+id/battery_optimization" + android:id="@+id/os_optimization" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" @@ -190,7 +190,7 @@ android:padding="@dimen/infocard_padding" android:visibility="gone"> <TextView - android:id="@+id/batt_op_headline" + android:id="@+id/os_optimization_headline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/battery_optimizations_enabled" @@ -198,25 +198,26 @@ android:textSize="?attr/TextSizeHeadline" android:textStyle="bold"/> <TextView - android:id="@+id/batt_op_body" + android:id="@+id/os_optimization_body" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/batt_op_headline" + android:layout_below="@+id/os_optimization_headline" android:layout_marginBottom="8dp" android:layout_marginTop="8dp" android:text="@string/battery_optimizations_enabled_explained" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody"/> <Button - android:id="@+id/batt_op_disable" + android:id="@+id/os_optimization_disable" style="?android:attr/borderlessButtonStyle" android:layout_marginRight="-8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_below="@+id/batt_op_body" - android:text="@string/disable" android:textColor="@color/accent"/> + android:layout_alignParentRight="true" android:layout_below="@+id/os_optimization_body" + android:text="@string/disable" + android:textColor="@color/accent"/> </RelativeLayout> <LinearLayout diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 97eca53a4..046291896 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -718,4 +718,7 @@ <string name="select_text">Select text</string> <string name="show_error_message">Show error message</string> <string name="error_message">Error Message</string> + <string name="data_saver_enabled">Data saver enabled</string> + <string name="data_saver_enabled_explained">Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible.</string> + <string name="device_does_not_support_data_saver">Your device does not supporting disabling Data saver for Pix-Art Messenger.</string> </resources> |