summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/bluetooth_connection_access.xml40
-rw-r--r--res/layout/bluetooth_pb_access.xml48
-rw-r--r--res/layout/vpn_dialog.xml24
-rw-r--r--res/values/strings.xml11
-rw-r--r--res/values/styles.xml5
5 files changed, 115 insertions, 13 deletions
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
new file mode 100644
index 0000000..1e74162
--- /dev/null
+++ b/res/layout/bluetooth_connection_access.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, 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_height="match_parent"
+ android:layout_width="match_parent">
+
+ <LinearLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dip"
+ android:layout_marginRight="20dip"
+ android:gravity="center_horizontal"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
new file mode 100644
index 0000000..80f78a6
--- /dev/null
+++ b/res/layout/bluetooth_pb_access.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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_height="match_parent"
+ android:layout_width="match_parent">
+
+ <LinearLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dip"
+ android:layout_marginRight="20dip"
+ android:gravity="center_horizontal"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <CheckBox android:id="@+id/bluetooth_pb_alwaysallowed"
+ style="?android:attr/textAppearanceMedium"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dip"
+ android:text="@string/bluetooth_pb_alwaysallowed" />
+
+ </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index a4bb216..ffbfd4d 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -20,7 +20,7 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="5mm">
+ android:padding="3mm">
<LinearLayout android:id="@+id/editor"
android:layout_width="match_parent"
@@ -30,7 +30,7 @@
<TextView style="@style/vpn_label" android:text="@string/vpn_name"/>
<EditText style="@style/vpn_value" android:id="@+id/name"
- android:singleLine="true"/>
+ android:inputType="textCapWords"/>
<TextView style="@style/vpn_label" android:text="@string/vpn_type"/>
<Spinner style="@style/vpn_value" android:id="@+id/type"
@@ -38,11 +38,11 @@
android:entries="@array/vpn_types"/>
<TextView style="@style/vpn_label" android:text="@string/vpn_server"/>
- <EditText style="@style/vpn_value" android:id="@+id/server"
- android:singleLine="true"/>
+ <EditText style="@style/vpn_value" android:id="@+id/server"/>
<CheckBox style="@style/vpn_value" android:id="@+id/mppe"
android:text="@string/vpn_mppe"
+ android:singleLine="false"
android:visibility="gone"/>
<LinearLayout android:id="@+id/l2tp"
@@ -52,24 +52,27 @@
android:visibility="gone">
<TextView style="@style/vpn_label" android:text="@string/vpn_l2tp_secret"/>
<EditText style="@style/vpn_value" android:id="@+id/l2tp_secret"
- android:singleLine="true"
android:password="true"
android:hint="@string/vpn_not_used"/>
</LinearLayout>
- <LinearLayout android:id="@+id/ipsec_psk"
+ <LinearLayout android:id="@+id/ipsec_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_identifier"/>
<EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier"
- android:singleLine="true"
android:hint="@string/vpn_not_used"/>
+ </LinearLayout>
+ <LinearLayout android:id="@+id/ipsec_psk"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="gone">
<TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_secret"/>
<EditText style="@style/vpn_value" android:id="@+id/ipsec_secret"
- android:singleLine="true"
android:password="true"/>
</LinearLayout>
@@ -111,15 +114,14 @@
android:visibility="gone">
<TextView style="@style/vpn_label" android:text="@string/vpn_username"/>
- <EditText style="@style/vpn_value" android:id="@+id/username"
- android:singleLine="true"/>
+ <EditText style="@style/vpn_value" android:id="@+id/username"/>
<TextView style="@style/vpn_label" android:text="@string/vpn_password"/>
<EditText style="@style/vpn_value" android:id="@+id/password"
- android:singleLine="true"
android:password="true"/>
<CheckBox style="@style/vpn_value" android:id="@+id/save_login"
+ android:singleLine="false"
android:text="@string/vpn_save_login"/>
</LinearLayout>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 364ae3e..0378aeb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -295,6 +295,15 @@
<!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
<string name="bluetooth_connection_dialog_text">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
+ <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+ <string name="bluetooth_phonebook_request">"Phone book request"</string>
+
+ <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+ <string name="bluetooth_pb_acceptance_dialog_text">%1$s would like to access your contacts and call history. Give access to %2$s?</string>
+
+ <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+ <string name="bluetooth_pb_alwaysallowed">Always allowed?</string>
+
<!-- Date & time settings screen title -->
<string name="date_and_time">Date &amp; time settings</string>
<!-- Date/time settings. Summary of the checkbox for choosing between 12 hour time or 24 hour time. Sample of 12-hour time -->
@@ -3447,7 +3456,7 @@ found in the list of installed applications.</string>
<!-- Checkbox label to save the username and the password for a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_save_login">Save account information</string>
- <!-- Hint for an optional input of a VPN network. [CHAR LIMIT=40] -->
+ <!-- Hint for not filling an optional field in a VPN configuration. [CHAR LIMIT=40] -->
<string name="vpn_not_used">(not used)</string>
<!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
<string name="vpn_no_ca_cert">(do not verify server)</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0f73abf..d7f8d9b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -143,12 +143,15 @@
<style name="vpn_label">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">14sp</item>
+ <item name="android:textSize">16sp</item>
</style>
<style name="vpn_value">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
+ <item name="android:textSize">18sp</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:paddingBottom">1mm</item>
</style>
<style name="InputMethodPreferenceStyle">
generated by cgit v1.1 at 2025-08-25 09:21:47 +0000