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

Commit b07b62db authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 QPR1 

Bug: 210511427
Merged-In: Iae5e73b18d8885df51c1fca1ef27e277721a8237
Change-Id: Id334bdfd9f81b6ad5f97edd4c50d8df49efb4c9c
parents 6fcd0f86 c4a6b5cc

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ android_library { 
        "androidx.preference_preference",

        "androidx.slice_slice-view",

        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

    ],

    manifest: "AndroidManifest-common.xml",

AndroidManifest-common.xml

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
        <activity

            android:name="com.android.launcher3.settings.SettingsActivity"

            android:label="@string/settings_button_text"

            android:theme="@style/HomeSettingsTheme"

            android:theme="@style/HomeSettings.Theme"

            android:exported="true"

            android:autoRemoveFromRecents="true">

            <intent-filter>

quickstep/AndroidManifest.xml

+0 −20
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ 
     xmlns:tools="http://schemas.android.com/tools"

     package="com.android.launcher3">



     <permission

        android:name="${packageName}.permission.HOTSEAT_EDU"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signatureOrSystem" />



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

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

    <uses-permission android:name="android.permission.VIBRATE"/>
@@ -41,7 +36,6 @@ 
    <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/>

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



    <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" />

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



    <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -133,20 +127,6 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".hybridhotseat.HotseatEduActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:noHistory="true"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:permission="${packageName}.permission.HOTSEAT_EDU"

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU"/>

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

            </intent-filter>

        </activity>



    </application>



</manifest>

quickstep/res/interpolator/app_open_x.xml

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

<!--

/*

** Copyright 2021, 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.

*/

-->



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

    android:pathData="M 0, 0 C 0.1217, 0.0462, 0.15, 0.4686, 0.1667, 0.66 C 0.1834, 0.8878, 0.1667, 1, 1, 1"/>

quickstep/res/interpolator/three_point_fast_out_extra_slow_in.xml

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

<!--

/*

** Copyright 2021, 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.

*/

-->



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

    android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1"/>