diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-07 10:49:43 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-07 10:49:43 +0100 |
| commit | 9edbddd7e1f9601f8b0cdd4024512988e74cdeee (patch) | |
| tree | 246654063805429229bd87c4334727969d3d3a73 /src/main/res | |
| parent | d369ec767f14720f3aa1adc908dbbd9da3aa0ad7 (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 | 16 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 64393b25..ea4d49c8 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -163,7 +163,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" @@ -175,7 +175,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" @@ -183,25 +183,27 @@ 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="?attr/color_text_primary" 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> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 19ddc040..654446e2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -696,4 +696,7 @@ <string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</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 Conversations from accessing the Internet when in background. To receive notifications of new messages you should allow Conversations unrestricted access when Data saver is on.\nConversations 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 Conversations.</string> </resources> |