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

Commit bba589ff authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Convert PermissionController to Nav Component"

parents 03478de0 4a85240a

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ android_app { 
        "androidx.lifecycle_lifecycle-extensions",

        "androidx.lifecycle_lifecycle-common-java8",

        "kotlinx-coroutines-android",

        "androidx.navigation_navigation-common-ktx",

        "androidx.navigation_navigation-fragment-ktx",

        "androidx.navigation_navigation-runtime-ktx",

        "androidx.navigation_navigation-ui-ktx",

        "SettingsLibHelpUtils",

        "SettingsLibRestrictedLockUtils",

        "SettingsLibAppPreference",

AndroidManifest.xml

+1 −4
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
                  android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">

            <intent-filter android:priority="1">

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

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

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

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

                <action android:name="android.intent.action.REVIEW_PERMISSION_USAGE" />
@@ -128,10 +129,6 @@ 
                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:theme="@style/Settings"

                  android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">

            <intent-filter android:priority="1">

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

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

            </intent-filter>

        </activity>



        <activity android:name="com.android.permissioncontroller.permission.ui.ReviewPermissionsActivity"

res/anim/activity_close_enter.xml

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

<!--

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

  -->



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

    android:shareInterpolator="false">

    <scale

        android:fromXScale="1.1"

        android:toXScale="1"

        android:fromYScale="1.1"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file

res/anim/activity_close_exit.xml

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

<!--

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

  -->



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

    android:shareInterpolator="false"

    android:zAdjustment="top">

    <alpha

        android:fromAlpha="1"

        android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="33"

        android:duration="50"/>

    <scale

        android:fromXScale="1"

        android:toXScale="0.9"

        android:fromYScale="1"

        android:toYScale="0.9"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file

res/anim/activity_open_enter.xml

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

<!--

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

  -->



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

    android:shareInterpolator="false">

    <alpha

        android:fromAlpha="0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="50"

        android:duration="50"/>

    <scale

        android:fromXScale="0.85"

        android:toXScale="1"

        android:fromYScale="0.85"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file