summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-04-06 12:20:33 -0700
committerRoman Birg <roman@cyngn.com>2015-12-11 10:35:37 -0800
commitbc86445070a5ea526242d8e4e4389d7824a75fd4 (patch)
tree53ca073a2382cf897012fe836a9eb9fde4a65263 /res/layout
parentf47c70b11106be8aa148c4788e06081df2ea0a1d (diff)
downloadpackages_apps_Settings-bc86445070a5ea526242d8e4e4389d7824a75fd4.tar.gz
packages_apps_Settings-bc86445070a5ea526242d8e4e4389d7824a75fd4.tar.bz2
packages_apps_Settings-bc86445070a5ea526242d8e4e4389d7824a75fd4.zip
Settings: handle decrypting larger pattern sizes
Change-Id: Id24d46829063171fa87cabb23a7da378726d7548 Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/crypt_keeper_pattern_entry.xml12
-rw-r--r--res/layout/crypt_keeper_pattern_sizes.xml73
2 files changed, 85 insertions, 0 deletions
diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml
index 00d3d6ecd..410f019b8 100644
--- a/res/layout/crypt_keeper_pattern_entry.xml
+++ b/res/layout/crypt_keeper_pattern_entry.xml
@@ -36,6 +36,18 @@
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/pattern_sizes"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
+ android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
+ android:orientation="horizontal">
+
+ <include layout="@layout/crypt_keeper_pattern_sizes" />
+
+ </LinearLayout>
+
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>
diff --git a/res/layout/crypt_keeper_pattern_sizes.xml b/res/layout/crypt_keeper_pattern_sizes.xml
new file mode 100644
index 000000000..acbb238d1
--- /dev/null
+++ b/res/layout/crypt_keeper_pattern_sizes.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The CyanogenMod 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <Button
+ android:id="@+id/lock_pattern_size_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_3"
+ android:textColor="@color/text_color_white"
+ android:layout_weight="1"
+ android:onClick="onPatternButtonClick"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <Button
+ android:id="@+id/lock_pattern_size_4"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_4"
+ android:textColor="@color/text_color_white"
+ android:layout_weight="1"
+ android:onClick="onPatternButtonClick"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <Button
+ android:id="@+id/lock_pattern_size_5"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_5"
+ android:textColor="@color/text_color_white"
+ android:layout_weight="1"
+ android:onClick="onPatternButtonClick"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <Button
+ android:id="@+id/lock_pattern_size_6"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_6"
+ android:textColor="@color/text_color_white"
+ android:layout_weight="1"
+ android:onClick="onPatternButtonClick"
+ style="?android:attr/borderlessButtonStyle"/>
+
+
+</merge >
+