From 006b1e68521236001514d77ed99ceed779e3d44c Mon Sep 17 00:00:00 2001
From: Andrea Gottardo <andrea@tailscale.com>
Date: Fri, 17 May 2024 10:54:55 -0700
Subject: [PATCH] values: cleanup unused resources (#403)

Removes some unused strings and drawables. Sets some strings as not-translatable for future localization efforts.
---
 android/src/main/res/drawable/androidicon.xml | 41 -------------------
 .../main/res/drawable/androidicon_light.xml   | 34 ---------------
 android/src/main/res/values/strings.xml       | 23 ++++-------
 3 files changed, 7 insertions(+), 91 deletions(-)
 delete mode 100644 android/src/main/res/drawable/androidicon.xml
 delete mode 100644 android/src/main/res/drawable/androidicon_light.xml

diff --git a/android/src/main/res/drawable/androidicon.xml b/android/src/main/res/drawable/androidicon.xml
deleted file mode 100644
index e58ef7b..0000000
--- a/android/src/main/res/drawable/androidicon.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="200dp"
-    android:viewportWidth="200"
-    android:viewportHeight="200">
-  <path
-      android:pathData="M0,0h200v200h-200z"
-      android:fillColor="#1F1E1E"/>
-  <path
-      android:pathData="M50,62.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.4"/>
-  <path
-      android:pathData="M87.5,62.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.4"/>
-  <path
-      android:pathData="M125,62.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.4"/>
-  <path
-      android:pathData="M50,100a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M87.5,100a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M125,100a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M50,137.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.4"/>
-  <path
-      android:pathData="M87.5,137.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M125,137.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.4"/>
-</vector>
diff --git a/android/src/main/res/drawable/androidicon_light.xml b/android/src/main/res/drawable/androidicon_light.xml
deleted file mode 100644
index 341e69f..0000000
--- a/android/src/main/res/drawable/androidicon_light.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="200dp"
-    android:viewportWidth="200"
-    android:viewportHeight="200">
-
-  <path
-      android:pathData="M50,62.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#cccccc"/>
-  <path
-      android:pathData="M87.5,62.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#cccccc"/>
-  <path
-      android:pathData="M125,62.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#cccccc"/>
-  <path
-      android:pathData="M50,100a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#222222"/>
-  <path
-      android:pathData="M87.5,100a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#222222"/>
-  <path
-      android:pathData="M125,100a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#222222"/>
-  <path
-      android:pathData="M50,137.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#cccccc"/>
-  <path
-      android:pathData="M87.5,137.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#222222"/>
-  <path
-      android:pathData="M125,137.5a12.5,12.5 0,1 0,25 0a12.5,12.5 0,1 0,-25 0z"
-      android:fillColor="#cccccc"/>
-</vector>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 8a59d1d..682419d 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -10,9 +10,8 @@
     <string name="unknown_user">Unknown user</string>
     <string name="connected">Connected</string>
     <string name="not_connected">Not connected</string>
-    <string name="empty"> </string>
-    <string name="template">%s</string>
-    <string name="more">More</string>
+    <string name="empty" translatable="false"> </string>
+    <string name="template" translatable="false">%s</string>
     <string name="selected">Selected</string>
     <string name="offline">Offline</string>
     <string name="ok">OK</string>
@@ -23,8 +22,8 @@
     <string name="no_results">No results</string>
 
     <!-- Strings for the about screen -->
-    <string name="app_name">Tailscale</string>
-    <string name="tile_name">Tailscale</string>
+    <string name="app_name" translatable="false">Tailscale</string>
+    <string name="tile_name" translatable="false">Tailscale</string>
     <string name="version">Version</string>
     <string name="about_view_header">About Tailscale</string>
     <string name="about_view_title">Tailscale for Android</string>
@@ -32,7 +31,6 @@
     <string name="privacy_policy">Privacy Policy</string>
     <string name="terms_of_service">Terms of Service</string>
     <string name="about_view_footnotes">WireGuard is a registered trademark of Jason A. Donenfeld.\n\n© 2024 Tailscale Inc. All rights reserved.\nTailscale is a registered trademark of Tailscale Inc.</string>
-    <string name="app_icon_content_description">The Tailscale app icon</string>
     <string name="managed_by">Managed by</string>
 
     <!-- Strings for the bug reporting screen -->
@@ -84,14 +82,12 @@
     <string name="open_support">Open support</string>
 
     <!-- State strings -->
-    <string name="waiting">Starting…</string>
-    <string name="placeholder">--</string>
+    <string name="placeholder" translatable="false">--</string>
     <string name="please_login">Login required</string>
     <string name="stopped">Not connected</string>
     <string name="connect_to_vpn">Connect to VPN</string>
 
     <!-- Time conversion templates -->
-    <string name="expired">expired</string>
     <string name="under_a_minute">under a minute</string>
     <string name="in_x_minutes">in %d minutes</string>
     <string name="in_x_hours">in %d hours</string>
@@ -106,11 +102,9 @@
     <string name="ago_x_years">%.1f years ago</string>
 
     <!-- Strings for the user switcher -->
-    <string name="user_switcher">Accounts</string>
     <string name="logout_failed">Unable to logout at this time. Please try again.</string>
     <string name="error">Error</string>
     <string name="accounts">Accounts</string>
-    <string name="manage_accounts">Manage accounts</string>
     <string name="add_account">Add another account</string>
     <string name="add_account_short">Add account</string>
     <string name="reauthenticate">Reauthenticate</string>
@@ -120,7 +114,7 @@
     <string name="invalidCustomURLTitle">Invalid URL</string>
     <string name="custom_control_menu">Use an alternate server</string>
     <string name="custom_control_menu_desc">Enter the URL of an alternate Tailscale server or your self-hosted Headscale server.</string>
-    <string name="custom_control_placeholder">https://my.custom.server.com</string>
+    <string name="custom_control_placeholder" translatable="false">https://my.custom.server.com</string>
     <string name="auth_key_menu">Use an auth key</string>
     <string name="auth_key_title">Add an account using an auth key</string>
     <string name="auth_key_explanation">Enter a valid auth key generated by the Tailscale admin console</string>
@@ -133,8 +127,7 @@
     <!-- Strings for ExitNode picker -->
     <string name="choose_exit_node">Choose exit node</string>
     <string name="choose_mullvad_exit_node">Mullvad exit nodes</string>
-    <string name="tailnet_exit_nodes">Tailnet exit nodes</string>
-    <string name="mullvad_exit_nodes">Mullvad VPN</string>
+    <string name="mullvad_exit_nodes" translatable="false">Mullvad VPN</string>
     <string name="best_available">Best available</string>
     <string name="run_as_exit_node">Run as exit node</string>
     <string name="run_this_device_as_an_exit_node">Run as exit node?</string>
@@ -211,7 +204,6 @@
 
     <!-- Permissions Management -->
     <string name="permissions">Permissions</string>
-    <string name="permission_required">Permission required</string>
     <string name="permission_write_external_storage">Storage</string>
     <string name="permission_write_external_storage_needed">We use storage in order to receive files with Taildrop.</string>
     <string name="permission_post_notifications">Notifications</string>
@@ -229,7 +221,6 @@
     <string name="taildrop_share_failed">Taildrop failed. Some files were not shared. Please try again.</string>
     <string name="taildrop_sending">Sending</string>
     <string name="taildrop_share_failed_short">Failed</string>
-    <string name="file_notification">File received</string>
 
 
     <!-- Error Dialog Titles -->