From 07c65a00d096197a1a2ca94f9f866d7453c1686f Mon Sep 17 00:00:00 2001 From: Andrea Gottardo Date: Tue, 26 Mar 2024 15:11:55 -0700 Subject: [PATCH] android: add app_restrictions.xml and manifest entry Fixes ENG-2926 Adds an `app_restrictions.xml` file with our available MDM policies, and a new entry to the AndroidManifest.xml file to declare its availability. Signed-off-by: Andrea Gottardo --- android/src/main/AndroidManifest.xml | 8 +- android/src/main/res/values/string-arrays.xml | 31 +++++ android/src/main/res/values/strings.xml | 29 +++++ android/src/main/res/xml/app_restrictions.xml | 113 ++++++++++++++++++ 4 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 android/src/main/res/values/string-arrays.xml create mode 100644 android/src/main/res/xml/app_restrictions.xml diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index aa30b6d..bb5e8ce 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -29,9 +29,9 @@ android:allowBackup="false" android:banner="@drawable/tv_banner" android:icon="@mipmap/ic_launcher" - android:theme="@style/Theme.AppCompat" android:label="Tailscale" - android:roundIcon="@mipmap/ic_launcher_round"> + android:roundIcon="@mipmap/ic_launcher_round" + android:theme="@style/Theme.AppCompat"> + + diff --git a/android/src/main/res/values/string-arrays.xml b/android/src/main/res/values/string-arrays.xml new file mode 100644 index 0000000..f391438 --- /dev/null +++ b/android/src/main/res/values/string-arrays.xml @@ -0,0 +1,31 @@ + + + + current-user + other-users + tagged-devices + + + Current user devices + Other users devices + Tagged devices + + + always + never + user-decides + + + Always + Never + User Decides + + + show + hide + + + Show + Hide + + \ No newline at end of file diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 625724e..01f4794 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -131,4 +131,33 @@ nodes available cities available + + Prevents the user from disconnecting Tailscale. + Force Enabled Connection Toggle + Exit Node ID + Forces the Tailscale client to always use the exit node with the given ID. + Managed By - Organization Name + Managed By - Caption + Managed By - URL + Shows a button to open support resources next to the organization name. + Shows the given caption next to the organization name in the client. + Shows the given organization name in the client. + The Tailnet policy allows the organization to specify a tailnet, its identity provider will be used on the login page. If the policy value is prefixed with required:, Tailscale will force that identity provider to be used and won’t allow logging in with anything else. + Required/Suggested Tailnet + Custom control server URL + Use this field to specify a custom coordination server URL, such as a Headscale instance. + Hidden Network Devices + Hides the specified categories of network devices from the devices list in the client. + Allow LAN Access when using an exit node + Enable Posture Checking + Use Tailscale DNS Settings + Use Tailscale Subnets + Allow Incoming Connections + Exit Node Picker Visibility + Shows or hides the exit node picker in the main view of the app. + Shows or hides the Tailnet lock configuration UI. + Manage Tailnet lock visibility + Shows or hides the UI to run the Android device as an exit node. + Run As Exit Node visibility + diff --git a/android/src/main/res/xml/app_restrictions.xml b/android/src/main/res/xml/app_restrictions.xml new file mode 100644 index 0000000..ea793cd --- /dev/null +++ b/android/src/main/res/xml/app_restrictions.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file