diff options
author | Prerepa Viswanadham <dham@google.com> | 2015-04-10 12:47:03 -0700 |
---|---|---|
committer | Prerepa Viswanadham <dham@google.com> | 2015-04-10 12:47:03 -0700 |
commit | b16987ba229fb3f9f909514c8891e999816939a2 (patch) | |
tree | 47583f4db0c83561716f542fc4d46aa503a3417c /res | |
parent | 82e165522e72f1c40ca92eca37428d35769c5022 (diff) | |
parent | 994932f1949316fe5520d6c690e6bd9b49b88ba6 (diff) | |
download | android_packages_apps_CertInstaller-b16987ba229fb3f9f909514c8891e999816939a2.tar.gz android_packages_apps_CertInstaller-b16987ba229fb3f9f909514c8891e999816939a2.tar.bz2 android_packages_apps_CertInstaller-b16987ba229fb3f9f909514c8891e999816939a2.zip |
Merge commit '994932f1949316fe5520d6c690e6bd9b49b88ba6' into merge_work
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/wifi_detail_dialog.xml | 33 | ||||
-rw-r--r-- | res/layout/wifi_main_dialog.xml | 41 | ||||
-rw-r--r-- | res/values/strings.xml | 13 |
3 files changed, 87 insertions, 0 deletions
diff --git a/res/layout/wifi_detail_dialog.xml b/res/layout/wifi_detail_dialog.xml new file mode 100644 index 0000000..af152ca --- /dev/null +++ b/res/layout/wifi_detail_dialog.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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_width="match_parent" + android:layout_height="wrap_content" + android:scrollbars="horizontal" > + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="15dip"> + + <TextView android:id="@+id/wifi_detail_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> +</ScrollView> diff --git a/res/layout/wifi_main_dialog.xml b/res/layout/wifi_main_dialog.xml new file mode 100644 index 0000000..8f680b8 --- /dev/null +++ b/res/layout/wifi_main_dialog.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:padding="15dip"> + + <TextView android:id="@+id/wifi_info" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textStyle="bold" /> + + <Button android:id="@+id/wifi_detail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="12dp" + android:text="@string/wifi_detail_label" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> +</ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index e0bd560..6b5f389 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -85,4 +85,17 @@ <item>VPN and apps</item> <item>Wi-Fi</item> </string-array> + + <string name="wifi_title">Wi-Fi Profile</string> + <string name="wifi_detail_title">Details for %s</string> + <string name="wifi_detail_label">Details</string> + <string name="wifi_install_label">Install</string> + <string name="wifi_cancel_label">Cancel</string> + <string name="wifi_dismiss_label">Dismiss</string> + <string name="wifi_no_config">None</string> + <string name="wifi_config_text">Name: %1$s\nFQDN: %2$s\nRoaming Consortiums: %3$s\nRealm: %4$s\nAuth method: EAP-%5$s\n</string> + <string name="wifi_ttls_config_text">User name: %s\n</string> + <string name="wifi_tls_config_text">Client certificate:\n%1$s\nKey: %2$s\n</string> + <string name="wifi_sim_config_text">SIM: %s\n</string> + <string name="wifi_trust_config_text">Trust certificate:\n%s\n</string> </resources> |