summaryrefslogtreecommitdiffstats
path: root/res/layout/confirm_lock_password.xml
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-02-09 19:08:02 -0800
committerJim Miller <jaggies@google.com>2010-02-10 14:42:35 -0800
commit2f9dbcb49174d85218dd18e3b2097d3b9fc789c7 (patch)
treef38e287a4b829dd448370b9d1c7fc156c3423463 /res/layout/confirm_lock_password.xml
parent42241e75d2775b6b44b82b939e66fbb50d4b189b (diff)
downloadpackages_apps_Settings-2f9dbcb49174d85218dd18e3b2097d3b9fc789c7.zip
packages_apps_Settings-2f9dbcb49174d85218dd18e3b2097d3b9fc789c7.tar.gz
packages_apps_Settings-2f9dbcb49174d85218dd18e3b2097d3b9fc789c7.tar.bz2
Fix 2373088: Update SecuritySettings with new layout and minor logic tweaks.
Diffstat (limited to 'res/layout/confirm_lock_password.xml')
-rw-r--r--res/layout/confirm_lock_password.xml27
1 files changed, 27 insertions, 0 deletions
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
new file mode 100644
index 0000000..3a27b9d
--- /dev/null
+++ b/res/layout/confirm_lock_password.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2008, 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.
+*/
+-->
+
+<!-- This is basically the same layout now, but will likely change -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <include
+ layout="@layout/choose_lock_password"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ />
+</merge>