diff options
author | Hung-ying Tyan <tyanh@google.com> | 2009-07-02 00:26:46 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2009-07-03 23:00:53 +0800 |
commit | 7031ab0d756327496ac3ce1e082b53c94be2f3b1 (patch) | |
tree | 085e3a09725957e891c25e97079ea7748091665a /res/layout | |
parent | 132b21440b1b930322fc129a504afa6107835f8e (diff) | |
download | packages_apps_Settings-7031ab0d756327496ac3ce1e082b53c94be2f3b1.zip packages_apps_Settings-7031ab0d756327496ac3ce1e082b53c94be2f3b1.tar.gz packages_apps_Settings-7031ab0d756327496ac3ce1e082b53c94be2f3b1.tar.bz2 |
Add credential storage settings.
* Changes
+ Initial implementation of credential storage settings.
+ Use alert icon on delete and reconnect dialogs in VpnSettings.
(piggy-backed)
Patch Set 12:
+ Add password length and no-space verification.
+ Simplify dialog view xml files.
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/cstor_name_credential_dialog_view.xml | 58 | ||||
-rw-r--r-- | res/layout/cstor_set_password_dialog_view.xml | 76 | ||||
-rw-r--r-- | res/layout/cstor_unlock_dialog_view.xml | 40 |
3 files changed, 174 insertions, 0 deletions
diff --git a/res/layout/cstor_name_credential_dialog_view.xml b/res/layout/cstor_name_credential_dialog_view.xml new file mode 100644 index 0000000..e5ccb36 --- /dev/null +++ b/res/layout/cstor_name_credential_dialog_view.xml @@ -0,0 +1,58 @@ +<?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="fill_parent" + android:layout_height="wrap_content"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="15dip"> + + <TextView android:id="@+id/cstor_name_credential_hint" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/vpn_connect_normal_text_size" + android:text="@string/cstor_name_credential_hint" + android:layout_marginBottom="10sp" /> + + <TextView android:id="@+id/cstor_error" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textColor="@color/red" + android:textStyle="bold" /> + + <TextView android:id="@+id/cstor_credential_name_title" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/cstor_credential_name" /> + <EditText android:id="@+id/cstor_credential_name" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:singleLine="True"/> + + <TextView android:id="@+id/cstor_credential_info_title" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/cstor_credential_info" /> + <TextView android:id="@+id/cstor_credential_info" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> +</ScrollView> diff --git a/res/layout/cstor_set_password_dialog_view.xml b/res/layout/cstor_set_password_dialog_view.xml new file mode 100644 index 0000000..eda317a --- /dev/null +++ b/res/layout/cstor_set_password_dialog_view.xml @@ -0,0 +1,76 @@ +<?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="fill_parent" + android:layout_height="wrap_content"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="15dip"> + + <TextView android:id="@+id/cstor_first_time_hint" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/vpn_connect_normal_text_size" + android:text="@string/cstor_first_time_hint" + android:layout_marginBottom="10sp" /> + + <TextView android:id="@+id/cstor_error" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textColor="@color/red" + android:textStyle="bold" + android:text="@string/cstor_password_empty_error" /> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/cstor_old_password_block" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/cstor_old_password" /> + <EditText android:id="@+id/cstor_old_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:password="True" + android:singleLine="True"/> + </LinearLayout> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/cstor_new_password" /> + <EditText android:id="@+id/cstor_new_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:password="True" + android:singleLine="True"/> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/cstor_confirm_password" /> + <EditText android:id="@+id/cstor_confirm_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:password="True" + android:singleLine="True"/> + + </LinearLayout> +</ScrollView> diff --git a/res/layout/cstor_unlock_dialog_view.xml b/res/layout/cstor_unlock_dialog_view.xml new file mode 100644 index 0000000..66a2175 --- /dev/null +++ b/res/layout/cstor_unlock_dialog_view.xml @@ -0,0 +1,40 @@ +<?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="fill_parent" + android:layout_height="wrap_content"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="15dip"> + + <TextView android:id="@+id/cstor_error" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textColor="@color/red" + android:textStyle="bold" /> + + <EditText android:id="@+id/cstor_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:password="True" + android:singleLine="True"/> + + </LinearLayout> +</ScrollView> |