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

Commit db08230d authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Add fragment transition animations to Wallpaper Picker" into udc-qpr-dev

parents 2b1e19a1 6d1bafdb

res/layout/fragment_clock_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:clipChildren="false">

    android:clipChildren="false"

    android:transitionGroup="true">



    <FrameLayout

        android:id="@+id/section_header_container"

res/layout/fragment_lock_screen_quick_affordances.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:clipChildren="false">

    android:clipChildren="false"

    android:transitionGroup="true">



    <FrameLayout

        android:id="@+id/section_header_container"

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
        <item name="colorSurface">@color/design_default_color_surface</item>

        <item name="colorOnSurface">@color/design_default_color_on_surface</item>

        <item name="android:textAllCaps">false</item>

        <item name="motionDurationLong1">500</item>

    </style>



    <!-- Snackbar margin -->

src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt

+7 −0
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider

import androidx.transition.Transition

import androidx.transition.doOnStart

import com.android.customization.model.grid.ui.binder.GridScreenBinder

import com.android.customization.model.grid.ui.viewmodel.GridScreenViewModel

import com.android.customization.module.ThemePickerInjector
@@ -85,6 +88,10 @@ class GridFragment2 : AppbarFragment() { 
            }

        )



        (returnTransition as? Transition)?.doOnStart {

            view.requireViewById<View>(R.id.preview).isVisible = false

        }



        return view

    }

src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt

+5 −0
Original line number Diff line number Diff line
@@ -20,8 +20,11 @@ import android.view.LayoutInflater 
import android.view.View

import android.view.ViewGroup

import androidx.cardview.widget.CardView

import androidx.core.view.isVisible

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get

import androidx.transition.Transition

import androidx.transition.doOnStart

import com.android.customization.module.ThemePickerInjector

import com.android.customization.picker.clock.ui.binder.ClockSettingsBinder

import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants
@@ -130,6 +133,8 @@ class ClockSettingsFragment : AppbarFragment() { 
            viewLifecycleOwner,

        )



        (returnTransition as? Transition)?.doOnStart { lockScreenView.isVisible = false }



        return view

    }