diff options
author | Chia-chi Yeh <chiachi@android.com> | 2011-01-20 18:46:01 +0800 |
---|---|---|
committer | Chia-chi Yeh <chiachi@android.com> | 2011-01-20 19:45:04 +0800 |
commit | 91d65a20af2d1bfb06f32d0bd821e8558afe939d (patch) | |
tree | 1998e5baaba8f5b71b1ad82fe37b4b54eadb7fb7 /res/layout/credentials_dialog.xml | |
parent | 9b37821d67f6db1d3d9a9603592e2f053f257fa7 (diff) | |
download | packages_apps_settings-91d65a20af2d1bfb06f32d0bd821e8558afe939d.zip packages_apps_settings-91d65a20af2d1bfb06f32d0bd821e8558afe939d.tar.gz packages_apps_settings-91d65a20af2d1bfb06f32d0bd821e8558afe939d.tar.bz2 |
Extract credential storage dialogs to a new activity.
Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.
Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d
Diffstat (limited to 'res/layout/credentials_dialog.xml')
-rw-r--r-- | res/layout/credentials_dialog.xml | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/res/layout/credentials_dialog.xml b/res/layout/credentials_dialog.xml new file mode 100644 index 0000000..506b3d6 --- /dev/null +++ b/res/layout/credentials_dialog.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="15dip"> + + <TextView android:id="@+id/hint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10sp"/> + + <TextView android:id="@+id/error" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10sp" + android:textColor="@color/red" + android:textStyle="bold" + android:visibility="gone"/> + + <TextView android:id="@+id/old_password_prompt" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/credentials_old_password" + android:visibility="gone"/> + + <EditText android:id="@+id/old_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true" + android:visibility="gone"/> + + <LinearLayout android:id="@+id/new_passwords" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + + <TextView android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/credentials_new_password"/> + + <EditText android:id="@+id/new_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true"/> + + <TextView android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/credentials_confirm_password"/> + + <EditText android:id="@+id/confirm_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true"/> + </LinearLayout> + </LinearLayout> +</ScrollView> |