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

Commit dbe270ce authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev am: bde4eb5b

am: 6b2d5be4

Change-Id: I3d542488d089b926662644d124098ca229fa5450
parents 13fdc917 6b2d5be4
Loading
Loading
Loading
Loading
+0 −25
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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">

    <objectAnimator
        android:propertyName="alpha"
        android:valueFrom="0"
        android:valueTo="0.9"
        android:interpolator="@android:interpolator/linear"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
</set>
+0 −30
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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">

    <objectAnimator
        android:propertyName="translationY"
        android:valueFrom="114dp"
        android:valueTo="0dp"
        android:interpolator="@android:interpolator/fast_out_slow_in"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
    <objectAnimator
        android:propertyName="alpha"
        android:valueTo="1"
        android:interpolator="@android:interpolator/linear"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
</set>
+0 −30
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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">

    <objectAnimator
        android:propertyName="translationY"
        android:valueFrom="84dp"
        android:valueTo="0dp"
        android:interpolator="@android:interpolator/fast_out_slow_in"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
    <objectAnimator
        android:propertyName="alpha"
        android:valueTo="1"
        android:interpolator="@android:interpolator/linear"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
</set>
+0 −30
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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">

    <objectAnimator
        android:propertyName="translationY"
        android:valueFrom="114dp"
        android:valueTo="0dp"
        android:interpolator="@android:interpolator/fast_out_slow_in"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
    <objectAnimator
        android:propertyName="alpha"
        android:valueTo="1"
        android:interpolator="@android:interpolator/fast_out_slow_in"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
</set>
+0 −30
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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">

    <objectAnimator
        android:propertyName="translationY"
        android:valueFrom="84dp"
        android:valueTo="0dp"
        android:interpolator="@android:interpolator/fast_out_slow_in"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
    <objectAnimator
        android:propertyName="alpha"
        android:valueTo="1"
        android:interpolator="@android:interpolator/fast_out_slow_in"
        android:duration="@integer/tv_pip_onboarding_anim_duration" />
</set>
Loading