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

Commit 63528dcc authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Automerger Merge Worker
Browse files

Merge changes I69fb6747,I1661f4ad into sc-dev am: 277c8e1b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14594233

Change-Id: I37a671393688bfe75db0fe79b6b3215201ee0a10
parents a8424ea5 277c8e1b

core/res/res/values-television/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -42,4 +42,8 @@ 


    <!-- Allow SystemUI to show the shutdown dialog -->

    <bool name="config_showSysuiShutdown">true</bool>



    <!-- Component name of the activity used to inform a user about a sensory being blocked because

     of privacy settings. -->

    <string name="config_sensorUseStartedActivity">com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity</string>

</resources>

packages/SystemUI/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -454,6 +454,14 @@ 
                  android:finishOnCloseSystemDialogs="true">

        </activity>



        <!-- started from SensoryPrivacyService -->

        <activity android:name=".sensorprivacy.television.TvUnblockSensorActivity"

                  android:exported="true"

                  android:permission="android.permission.MANAGE_SENSOR_PRIVACY"

                  android:theme="@style/BottomSheet"

                  android:finishOnCloseSystemDialogs="true">

        </activity>





        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.UsbAccessoryUriActivity"

packages/SystemUI/res/anim/tv_bottom_sheet_button_state_list_animator.xml

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

<!--

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

  -->



<selector

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

    <item android:state_focused="true">

        <set>

            <objectAnimator

                android:duration="200"

                android:propertyName="scaleX"

                android:valueFrom="1.0"

                android:valueTo="@dimen/bottom_sheet_button_selection_scaled"

                android:valueType="floatType"/>

            <objectAnimator

                android:duration="200"

                android:propertyName="scaleY"

                android:valueFrom="1.0"

                android:valueTo="@dimen/bottom_sheet_button_selection_scaled"

                android:valueType="floatType"/>

        </set>

    </item>

    <item android:state_focused="false">

        <set>

            <objectAnimator

                android:duration="200"

                android:propertyName="scaleX"

                android:valueFrom="@dimen/bottom_sheet_button_selection_scaled"

                android:valueTo="1.0"

                android:valueType="floatType"/>

            <objectAnimator

                android:duration="200"

                android:propertyName="scaleY"

                android:valueFrom="@dimen/bottom_sheet_button_selection_scaled"

                android:valueTo="1.0"

                android:valueType="floatType"/>

        </set>

    </item>

</selector>
 
 No newline at end of file

packages/SystemUI/res/anim/tv_bottom_sheet_enter.xml

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

<!--

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

  -->



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

     android:interpolator="@android:interpolator/decelerate_quint">

    <translate android:fromYDelta="100%"

               android:toYDelta="0"

               android:duration="900"/>

</set>
 
 No newline at end of file

packages/SystemUI/res/anim/tv_bottom_sheet_exit.xml

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

<!--

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

  -->



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

     android:interpolator="@android:interpolator/decelerate_quint">

    <translate android:fromYDelta="0"

               android:toYDelta="100%"

               android:duration="500"/>

</set>
 
 No newline at end of file