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

Commit 62774eb7 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1

parents 9c66b1bd ce3ddb80

Android.mk

+3 −3
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common

LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305



LOCAL_MODULE_TAGS := optional
@@ -15,8 +15,8 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 


LOCAL_SRC_FILES += \

        src/com/android/location/XT/IXTSrv.aidl \

        src/com/android/location/XT/IXTSrvCb.aidl \

        src/com/android/display/IPPService.aidl

        src/com/android/location/XT/IXTSrvCb.aidl



LOCAL_PACKAGE_NAME := Settings

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true

AndroidManifest.xml

+52 −23
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
    <uses-permission android:name="android.permission.SET_TIME" />

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

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

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

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

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

    <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
@@ -87,16 +88,6 @@ 
            android:supportsRtl="true"

            android:allowBackup="false">



      <!-- screen color Settings Controls -->

        <activity android:name=".ScreenColorSettings" android:label="@string/screencolor"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:screenOrientation="nosensor">

        </activity>

        <activity android:name=".CustomScreenColor" android:label="@string/custom_screencolor"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:screenOrientation="nosensor">

        </activity>



        <!-- Settings -->



        <activity android:name="Settings"
@@ -214,7 +205,8 @@ 
                android:theme="@style/SetupWizardDisableAppStartingTheme"

                android:label="@string/wifi_setup_wizard_title"

                android:icon="@drawable/empty_icon"

                android:clearTaskOnLaunch="true">

                android:clearTaskOnLaunch="true"

                android:windowSoftInputMode="adjustNothing">

            <intent-filter>

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

                <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
@@ -377,6 +369,16 @@ 
            </intent-filter>

        </activity>



        <service android:name=".TetherService"

            android:exported="true"

            android:permission="android.permission.CONNECTIVITY_INTERNAL" />

        <receiver

            android:name=".HotspotOffReceiver" >

            <intent-filter>

                <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />

            </intent-filter>

        </receiver>



        <activity android:name="Settings$TetherSettingsActivity"

                android:label="@string/wifi_hotspot_name"

                android:taskAffinity=""
@@ -722,17 +724,6 @@ 
                android:value="true" />

        </activity>



        <activity android:name="SettingsSafetyLegalActivity"

                android:label="@string/settings_safetylegal_activity_title"

                android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$ManageApplicationsActivity"

                android:label="@string/applications_settings"

                android:taskAffinity="">
@@ -1157,13 +1148,18 @@ 


        <!-- Lock screen settings -->

        <activity android:name="ConfirmDeviceCredentialActivity"

            android:exported="true">

            android:exported="true"

            android:theme="@style/Transparent">

            <intent-filter>

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />

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

            </intent-filter>

        </activity>



        <activity android:name=".SetupRedactionInterstitial"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"/>



        <activity android:name=".notification.RedactionInterstitial"/>



        <activity android:name=".notification.RedactionSettingsStandalone"
@@ -1188,6 +1184,16 @@ 
            android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name="SetupChooseLockGeneric"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"

            android:label="@string/lock_settings_picker_title">

            <intent-filter>

                <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />

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

            </intent-filter>

        </activity>



        <activity android:name="ChooseLockGeneric"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true" >
@@ -1204,11 +1210,26 @@ 
            android:excludeFromRecents="true"

        />



        <activity android:name="SetupChooseLockPattern"

            android:exported="false"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme" />



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



        <activity android:name="SetupChooseLockPassword"

            android:exported="false"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"

            android:windowSoftInputMode="stateVisible|adjustResize" />



        <activity android:name="ChooseLockPassword" android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name=".SetupEncryptionInterstitial"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"/>



        <activity android:name=".EncryptionInterstitial"/>



        <!-- Runs in the phone process since it needs access to the Phone object -->
@@ -2204,6 +2225,14 @@ 
            </intent-filter>

        </activity>

        <!-- Multi Sim Sound Setting Preference -->

        <activity android:name=".sim.SimDialogActivity"

                android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"

                android:label="@string/sim_settings_title"

                android:excludeFromRecents="true">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <provider

            android:name=".search.SettingsSearchIndexablesProvider"

res/drawable/ring_notif.xml→res/anim-ldrtl/slide_back_in.xml

+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2014 The Android Open Source Project
@@ -13,9 +14,9 @@ Copyright (C) 2014 The Android Open Source Project 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<!-- shrink ic_audio_ring_notif from 32dp to 24dp using insets -->

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

        android:drawable="@*android:drawable/ic_audio_ring_notif"

        android:inset="4dp"

        />



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

    android:duration="@integer/setup_wizard_transition_duration"

    android:fromXDelta="100%"

    android:toXDelta="0%"

    android:interpolator="@android:anim/decelerate_interpolator"/>

res/anim-ldrtl/slide_back_out.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2014 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.

-->



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

    android:duration="@integer/setup_wizard_transition_duration"

    android:fromXDelta="0%"

    android:toXDelta="-100%"

    android:interpolator="@android:anim/decelerate_interpolator"/>

res/anim-ldrtl/slide_next_in.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2014 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.

-->



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

    android:duration="@integer/setup_wizard_transition_duration"

    android:fromXDelta="-100%"

    android:toXDelta="0%"

    android:interpolator="@android:anim/decelerate_interpolator"/>