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

Commit eb7a665c authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'mr1.1-staging' of... 

Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Settings into mr1.1-staging

Change-Id: I17e7cea5e432d0025c64465a7c01c42bb24e7133
parents 8129ea29 20a2aaa9

AndroidManifest.xml

+21 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
    <uses-permission android:name="android.permission.READ_PROFILE" />

    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.SET_TIME" />



    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"
@@ -253,6 +254,7 @@ 
        </activity-alias>



        <activity android:name="Settings$ApnSettingsActivity" android:label="@string/apn_settings"

                  android:uiOptions="none"

                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:launchMode="singleTask" android:clearTaskOnLaunch="true">

            <intent-filter>
@@ -306,6 +308,7 @@ 


        <activity android:name="Settings$TetherSettingsActivity"

                android:label="@string/tether_settings_title_all"

                android:uiOptions="none"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>
@@ -327,6 +330,7 @@ 
        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".TetherSettings"

                  android:label="@string/tether_settings_title_all"

                  android:uiOptions="none"

                  android:clearTaskOnLaunch="true"

                  android:exported="true"

                  android:targetActivity="Settings$TetherSettingsActivity">
@@ -765,6 +769,7 @@ 


        <activity android:name="Settings$LocationSettingsActivity"

                android:label="@string/location_settings_title"

                android:uiOptions="none"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity=""

                android:excludeFromRecents="true">
@@ -960,8 +965,6 @@ 
        <activity android:name="ChooseLockPassword" android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



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



        <!-- Anonymous Statistics -->

        <receiver android:name=".cmstats.ReportingServiceManager"

            android:enabled="true"
@@ -1588,6 +1591,22 @@ 
                android:resource="@id/wireless_settings" />

        </activity>



        <activity android:name="Settings$DreamSettingsActivity"

                android:label="@string/screensaver_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.DREAM_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.DreamSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/display_settings" />

        </activity>



        <receiver android:name=".widget.SettingsAppWidgetProvider"

                android:label="@string/gadget_title"

                android:exported="true"

res/layout-land/choose_lock_pattern.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
                style="@style/SecurityPreferenceButtonContainer"

                android:layout_centerHorizontal="true"

                android:layout_alignParentBottom="true"

                android:orientation="vertical">

                android:orientation="horizontal">



                <!-- left / top button: skip, or re-try -->

                <Button android:id="@+id/footerLeftButton"

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-land/confirm_lock_pattern.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:id="@+id/topLayout"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/black">

    android:layout_height="match_parent">



    <!-- left side: instructions and messages -->

    <LinearLayout

res/layout-sw600dp-land/choose_lock_pattern.xml

+57 −67
Original line number Diff line number Diff line
@@ -17,31 +17,41 @@ 
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/topLayout"

    android:orientation="horizontal"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <!-- left side: lock pattern widget -->

    <RelativeLayout

        android:layout_width="0dip"

    android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="center_horizontal|center_vertical"

        android:orientation="horizontal">

    android:gravity="center_horizontal">



    <!-- header message -->

    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:layout_marginTop="14dip">



        <TextView android:id="@+id/headerText"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium"/>



    </ScrollView>



    <View

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="0.6"/>



    <!-- lock pattern widget -->

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

    <View

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"/>



    <!-- footer message -->

    <TextView android:id="@+id/footerText"
@@ -51,7 +61,7 @@ 
        android:layout_marginTop="16dip"

        android:layout_toEndOf="@id/lockPattern"

        android:layout_marginStart="100dip"

            android:textAppearance="?android:attr/textAppearanceLarge"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:visibility="gone"/>



    <!-- confirm / restart buttons -->
@@ -73,25 +83,5 @@ 


    </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:layout_above="@id/buttonContainer"

            android:gravity="center_vertical|center_horizontal">



            <TextView android:id="@+id/headerText"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAppearance="?android:attr/textAppearanceLarge"/>



        </ScrollView>





    </RelativeLayout>



</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>