Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49562681 authored by Danielle Millett's avatar Danielle Millett Committed by Android (Google) Code Review
Browse files

Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev

parents 5e337eda 12c1451f

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -961,8 +961,6 @@ 
        <activity android:name="ChooseLockPassword" android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.Status"

                android:label="@string/device_status_activity_title"

res/layout-land/choose_lock_pattern_tutorial.xml

deleted100644 → 0
+0 −92
Original line number Diff line number Diff line 
<?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>

res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
<?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>

res/layout-sw600dp/choose_lock_pattern_tutorial.xml

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
<?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>

res/layout/choose_lock_pattern_tutorial.xml

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
<?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>