diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-13 13:54:58 +0000 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:07:30 +0000 |
commit | 20a2aaa9595e9ab958d27eb430af6560e24ba78c (patch) | |
tree | d810cc69bfa5db15a0d8833cfc73a4618a0eee73 /res/layout-sw600dp | |
parent | f0ad93f3b99b9fd7c5191dc9fa91c59809d48870 (diff) | |
parent | 29a4eb7a33da12a957b3305138ada69140d8ab75 (diff) | |
download | packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.zip packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.gz packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.bz2 |
Merge commit 'android-4.2.2_r1' into mr1.1-staging
Conflicts:
AndroidManifest.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es/strings.xml
res/values-fi/strings.xml
res/values-hu/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/strings.xml
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/ChooseLockPatternTutorial.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/Settings.java
Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r-- | res/layout-sw600dp/choose_lock_pattern.xml | 8 | ||||
-rw-r--r-- | res/layout-sw600dp/choose_lock_pattern_tutorial.xml | 74 | ||||
-rw-r--r-- | res/layout-sw600dp/confirm_lock_pattern.xml | 8 |
3 files changed, 10 insertions, 80 deletions
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml index b0efa8c..dec8244 100644 --- a/res/layout-sw600dp/choose_lock_pattern.xml +++ b/res/layout-sw600dp/choose_lock_pattern.xml @@ -27,12 +27,14 @@ <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center" android:layout_marginTop="96dip"> <TextView android:id="@+id/headerText" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium"/> </ScrollView> @@ -41,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dip" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceMedium" android:visibility="gone"/> <!-- bottom: lock pattern --> diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml deleted file mode 100644 index e0221bf..0000000 --- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. ---> -<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/topLayout" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_horizontal"> - - <!-- top: instructions and buttons --> - <!-- header message --> - <ScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="96dip"> - - <TextView android:id="@+id/headerText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/lock_intro_message"/> - - </ScrollView> - - <!-- bottom: lock pattern --> - <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="354dip" - android:layout_height="354dip" - android:layout_marginTop="80dip" - aspect="square"/> - - <View - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <LinearLayout - style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentEnd="true" - android:orientation="horizontal"> - - <!-- left / top button: skip, or re-try --> - <Button android:id="@+id/skip_button" - style="@style/SecurityPreferenceButton" - android:text="@string/lockpattern_tutorial_cancel_label"/> - - <!-- right / bottom button: confirm or ok --> - <Button android:id="@+id/next_button" - style="@style/SecurityPreferenceButton" - android:text="@string/lockpattern_tutorial_continue_label"/> - - </LinearLayout> - - </RelativeLayout> - -</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml index d41525a..c32422e 100644 --- a/res/layout-sw600dp/confirm_lock_pattern.xml +++ b/res/layout-sw600dp/confirm_lock_pattern.xml @@ -26,12 +26,14 @@ <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center" android:layout_marginTop="96dip"> <TextView android:id="@+id/headerText" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium"/> </ScrollView> @@ -40,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dip" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:textAppearance="?android:attr/textAppearanceMedium"/> <!-- bottom: lock pattern --> <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" |