Merge changes from topic "vpn-dialog" (19bb1a0b) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+6 −2

Original line number	Diff line number	Diff line
		@@ -2167,10 +2167,14 @@
		<string name="config_customAdbPublicKeyConfirmationSecondaryUserComponent"
		>com.android.systemui/com.android.systemui.usb.UsbDebuggingSecondaryUserActivity</string>

		<!-- Name of the CustomDialog that is used for VPN -->
		<string name="config_customVpnConfirmDialogComponent"
		<!-- Name of the dialog that is used to request the user's consent to VPN connection -->
		<string name="config_customVpnConfirmDialogComponent" translatable="false"
		>com.android.vpndialogs/com.android.vpndialogs.ConfirmDialog</string>

		<!-- Name of the dialog that is used to inform the user that always-on VPN is disconnected -->
		<string name="config_customVpnAlwaysOnDisconnectedDialogComponent" translatable="false"
		>com.android.vpndialogs/com.android.vpndialogs.AlwaysOnDisconnectedDialog</string>

		<!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
		<string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>

core/res/res/values/strings.xml

+12 −7

Original line number	Diff line number	Diff line
		@@ -3445,16 +3445,21 @@
		<!-- The text of the notification when VPN is active with a session name. -->
		<string name="vpn_text_long">Connected to <xliff:g id="session" example="office">%s</xliff:g>. Tap to manage the network.</string>

		<!-- Notification title when connecting to lockdown VPN. -->
		<!-- Notification title when connecting to always-on VPN, a VPN that's set to always stay
		connected. -->
		<string name="vpn_lockdown_connecting">Always-on VPN connecting\u2026</string>
		<!-- Notification title when connected to lockdown VPN. -->
		<!-- Notification title when connected to always-on VPN, a VPN that's set to always stay
		connected. -->
		<string name="vpn_lockdown_connected">Always-on VPN connected</string>
		<!-- Notification title when not connected to lockdown VPN. -->
		<string name="vpn_lockdown_disconnected">Always-on VPN disconnected</string>
		<!-- Notification title when error connecting to lockdown VPN. -->
		<!-- Notification title when not connected to always-on VPN, a VPN that's set to always stay
		connected. -->
		<string name="vpn_lockdown_disconnected">Disconnected from always-on VPN</string>
		<!-- Notification title when error connecting to always-on VPN, a VPN that's set to always stay
		connected. -->
		<string name="vpn_lockdown_error">Always-on VPN error</string>
		<!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
		<string name="vpn_lockdown_config">Tap to set up</string>
		<!-- Notification body that indicates user can touch to configure always-on VPN, a VPN that's
		set to always stay connected. -->
		<string name="vpn_lockdown_config">Change network or VPN settings</string>

		<!-- Localized strings for WebView -->
		<!-- Label for button in a WebView that will open a chooser to choose a file to upload -->

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2003,6 +2003,7 @@
		<java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" />
		<java-symbol type="string" name="config_customAdbPublicKeyConfirmationSecondaryUserComponent" />
		<java-symbol type="string" name="config_customVpnConfirmDialogComponent" />
		<java-symbol type="string" name="config_customVpnAlwaysOnDisconnectedDialogComponent" />
		<java-symbol type="string" name="config_defaultNetworkScorerPackageName" />
		<java-symbol type="string" name="config_persistentDataPackageName" />
		<java-symbol type="string" name="reset_retail_demo_mode_title" />

packages/VpnDialogs/AndroidManifest.xml

+18 −8

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@

		<application android:label="VpnDialogs"
		android:allowBackup="false">

		<activity android:name=".ConfirmDialog"
		android:theme="@android:style/Theme.Material.Light.Dialog.Alert">
		<intent-filter>
		@@ -34,11 +35,20 @@

		<activity android:name=".ManageDialog"
		android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
		android:noHistory="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.DEFAULT"/>
		</intent-filter>
		android:noHistory="true"
		android:excludeFromRecents="true"
		android:permission="android.permission.NETWORK_SETTINGS"
		android:exported="true">
		</activity>

		<activity android:name=".AlwaysOnDisconnectedDialog"
		android:label="@string/always_on_disconnected_title"
		android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
		android:noHistory="true"
		android:excludeFromRecents="true"
		android:permission="android.permission.NETWORK_SETTINGS"
		android:exported="true">
		</activity>

		</application>
		</manifest>

packages/VpnDialogs/res/layout/always_on_disconnected.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2017 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
		implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="24dp">
		<TextView android:id="@+id/message"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"/>
		</ScrollView>