Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'kill-android4' into 'master'

Browse Source 
Drop support for Android 4

See merge request briar/briar!1770
This commit is contained in:
akwizgran
2023-05-05 13:54:07 +00:00
parent 6f57ec8281 76344344d2
commit f0c1ebcc1b
59 changed files with 346 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/res/layout/power_view.xml
View File

@@ -52,10 +52,10 @@
android:layout_height="24dp"
android:layout_margin="@dimen/margin_medium"
android:contentDescription="@string/help"
android:tint="@color/briar_button_text_positive"
app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/button"
app:srcCompat="@drawable/ic_help_outline_white" />
app:srcCompat="@drawable/ic_help_outline_white"
app:tint="@color/briar_button_text_positive" />
</merge>

1
briar-android/src/main/res/menu/conversation_actions.xml
View File

@@ -35,7 +35,6 @@
<item
android:id="@+id/action_transfer_data"
android:title="@string/removable_drive_menu_title"
android:visible="false"
app:showAsAction="never" />
</menu>
</item>

4
briar-android/src/main/res/values/strings.xml
View File

@@ -55,10 +55,6 @@
<item quantity="one">This is a test version of Briar. Your account will expire in %d day and cannot be renewed.</item>
<item quantity="other">This is a test version of Briar. Your account will expire in %d days and cannot be renewed.</item>
</plurals>
<plurals name="old_android_expiry_warning">
<item quantity="one">Android 4 is no longer supported. Briar will stop working on %s (in %d day). Please install Briar on a newer device and create a new account.</item>
<item quantity="other">Android 4 is no longer supported. Briar will stop working on %s (in %d days). Please install Briar on a newer device and create a new account.</item>
</plurals>
<string name="expiry_date_reached">This software has expired.\nThank you for testing!</string>
<string name="download_briar">To continue using Briar, please download the latest release.</string>
<string name="create_new_account">You will need to create a new account, but you can use the same nickname.</string>