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

Commit c9cd83a1 authored by Yi-Ling Chuang's avatar Yi-Ling Chuang
Browse files

Create SettingsTransitionActivity 

SettingsTransitionActivity is an abstract activity being in charge of
the transition feature. Activities extending it will get settings
transition applied.

We make CollapsingToolbarBaseActivity extend this activity. Clients
extending CollapsingToolbarBaseActivity will have both app bar behaviour
and the transition applied.

Also add android:transitionName into the collapsing layout, so the
transition would start from the back arrow on the action bar.

And bump the min_sdk to 29 to relevant dependencies.

Bug: 177480673
Test: rebuild and apply it on NotificationHistoryActivity
Change-Id: I8e070a0f07080d027fec7b944bdcdbb758ae44b7
parent 1618a4df

packages/SettingsLib/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ android_library { 
        "src/**/*.kt",

    ],



    min_sdk_version: "21",

    min_sdk_version: "29",



}

packages/SettingsLib/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.settingslib">



    <uses-sdk android:minSdkVersion="29" />



</manifest>

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ android_library { 
        "androidx.annotation_annotation",

        "androidx.core_core",

        "com.google.android.material_material",

        "SettingsLibSettingsTransition",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.cellbroadcast",

packages/SettingsLib/CollapsingToolbarBaseActivity/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.settingslib.collapsingtoolbar">



    <uses-sdk android:minSdkVersion="21" />

    <uses-sdk android:minSdkVersion="29" />



</manifest>

packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/content_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:transitionGroup="true">

    android:layout_height="match_parent">



    <com.google.android.material.appbar.AppBarLayout

        android:id="@+id/app_bar"
@@ -47,6 +46,7 @@ 
                android:layout_width="match_parent"

                android:layout_height="?attr/actionBarSize"

                android:theme="?android:attr/actionBarTheme"

                android:transitionName="shared_element_view"

                app:layout_collapseMode="pin"/>



        </com.android.settingslib.collapsingtoolbar.AdjustableToolbarLayout>