PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 783d0e7d: am a5ca5158: am 49562681: Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev

Browse Source 
* commit '783d0e7d9d2dcc05a45b2c5ec7117f61f460642d':
  Removing tutorial for choosing a pattern as part of b/7459863
This commit is contained in:
Danielle Millett
2012-11-30 19:10:32 -08:00
committed by Android Git Automerger
parent 2278a997a5 783d0e7d9d
commit c1570e6635
8 changed files with 1 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
res/layout-land/choose_lock_pattern_tutorial.xml
View File

@@ -1,92 +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">
<!-- Top: pattern and information -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="horizontal">
<!-- left side: lock pattern. Given the square aspect, this will be the smaller of the
two dimensions (height) -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<!-- right side: instructions and buttons -->
<!-- header message -->
<ScrollView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="25dip">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dip">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/lock_title"
android:paddingBottom="10dip"
style="?android:attr/textAppearanceLarge"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="18sp"
android:text="@string/lock_intro_message"
/>
</LinearLayout>
</ScrollView>
</LinearLayout>
<!-- Bottom: cancel/next buttons -->
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
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>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

86
res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
View File

@@ -1,86 +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="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- left side: lock pattern example widget -->
<RelativeLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal|center_vertical"
android:orientation="horizontal">
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="354dip"
android:layout_height="354dip"
aspect="square"/>
</RelativeLayout>
<!-- right side: instructions and buttons -->
<RelativeLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal">
<!-- navigation buttons -->
<LinearLayout android:id="@+id/buttonContainer"
style="@style/SecurityPreferenceButtonContainer"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="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>
<!-- header message -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="20dip"
android:layout_marginStart="20dip"
android:gravity="center_vertical|center_horizontal"
android:layout_above="@id/buttonContainer">
<TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lock_intro_message"
android:textAppearance="?android:attr/textAppearanceLarge"/>
</ScrollView>
</RelativeLayout>>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

74
res/layout-sw600dp/choose_lock_pattern_tutorial.xml
View File

@@ -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>

81
res/layout/choose_lock_pattern_tutorial.xml
View File

@@ -1,81 +0,0 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:gravity="center_horizontal">
<!-- top: instructions and buttons -->
<!-- header message -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dip">
<!-- Top: instructions -->
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/lock_title"
android:paddingBottom="10dip"
style="?android:attr/textAppearanceLarge"
android:visibility="visible"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/lock_intro_message"
/>
<!-- bottom: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="200dip"
android:layout_height="200dip"
android:layout_marginTop="10dip"
android:layout_gravity="start"/>
</LinearLayout>
</ScrollView>
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
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>
</LinearLayout>

18
res/values/strings.xml
View File

@@ -2435,24 +2435,6 @@
<!-- Displayed when user launches a widget configuration activity that was uninstalled -->
<string name="activity_not_found">Application is not installed on your phone.</string>
<!-- ChooseLockPatternTutorial --> <skip />
<!-- ChooseLockPatternTutorial, button labels: This is to cancel the tutorial -->
<string name="skip_button_label">Cancel</string>
<!-- ChooseLockPatternTutorial, button labels: Continue to the next page of the tutorial -->
<string name="next_button_label">Next</string>
<!-- ChooseLockPatternTutorial, tutorial screen title -->
<string name="lock_title" product="tablet">Securing your tablet</string>
<!-- ChooseLockPatternTutorial, tutorial screen title -->
<string name="lock_title" product="default">Securing your phone</string>
<!-- ChooseLockPatternTutorial, tutorial screen text -->
<string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You need to connect at least four dots.
\n\nReady to start? Touch Next.
</string>
<!-- ChooseLockPatternTutorial, tutorial screen text -->
<string name="lock_intro_message" product="default">Protect your phone from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect at least four dots in any order on the next screen.
\n\nReady to start? Touch Next.
</string>
<!-- Applications Settings --> <skip />
<!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications -->
<string name="manageapplications_settings_title">Manage apps</string>