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

Commit b26f7ed9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert transition codes in SettingsLib" into sc-dev

parents bdd8ff3f ff4ca837

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

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
    android:id="@+id/content_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:transitionGroup="true">

    android:fitsSystemWindows="true">



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

        android:id="@+id/app_bar"

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/SettingsTransitionActivity.java

+1 −65
Original line number Diff line number Diff line
@@ -16,22 +16,8 @@ 


package com.android.settingslib.collapsingtoolbar;



import static com.android.settingslib.transition.SettingsTransitionHelper.EXTRA_PAGE_TRANSITION_TYPE;



import android.app.ActivityOptions;

import android.content.Intent;

import android.os.Bundle;

import android.util.Log;

import android.view.Window;

import android.widget.Toolbar;



import androidx.annotation.Nullable;

import androidx.core.os.BuildCompat;

import androidx.fragment.app.FragmentActivity;



import com.android.settingslib.transition.SettingsTransitionHelper;

import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;



/**

 * A base Activity for Settings-specific page transition. Activities extending it will get

 * Settings transition applied.
@@ -39,57 +25,7 @@ import com.android.settingslib.transition.SettingsTransitionHelper.TransitionTyp 
public abstract class SettingsTransitionActivity extends FragmentActivity {

    private static final String TAG = "SettingsTransitionActivity";



    private Toolbar mToolbar;



    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        if (isSettingsTransitionEnabled()) {

            getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);

            SettingsTransitionHelper.applyForwardTransition(this);

            SettingsTransitionHelper.applyBackwardTransition(this);

        }



        super.onCreate(savedInstanceState);

    }



    @Override

    public void setActionBar(@Nullable Toolbar toolbar) {

        super.setActionBar(toolbar);



        mToolbar = toolbar;

    }



    @Override

    public void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle options) {

        final int transitionType = intent.getIntExtra(EXTRA_PAGE_TRANSITION_TYPE,

                TransitionType.TRANSITION_SHARED_AXIS);

        if (!isSettingsTransitionEnabled() ||

                transitionType == TransitionType.TRANSITION_NONE) {

            super.startActivityForResult(intent, requestCode, options);

            return;

        }



        super.startActivityForResult(intent, requestCode,

                createActivityOptionsBundleForTransition(options));

    }



    protected boolean isSettingsTransitionEnabled() {

        return BuildCompat.isAtLeastS();

    }



    @Nullable

    private Bundle createActivityOptionsBundleForTransition(@Nullable Bundle options) {

        if (mToolbar == null) {

            Log.w(TAG, "setActionBar(Toolbar) is not called. Cannot apply settings transition!");

            return options;

        }

        final Bundle transitionOptions = ActivityOptions.makeSceneTransitionAnimation(this,

                mToolbar, "shared_element_view").toBundle();

        if (options == null) {

            return transitionOptions;

        }

        final Bundle mergedOptions = new Bundle(options);

        mergedOptions.putAll(transitionOptions);

        return mergedOptions;

        return false;

    }

}

packages/SettingsLib/SettingsTransition/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ android_library { 
    name: "SettingsLibSettingsTransition",



    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],



    static_libs: [

        "com.google.android.material_material",

packages/SettingsLib/SettingsTransition/res/interpolator/fast_out_extra_slow_in.xml

deleted100644 → 0
+0 −19
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

  -->



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

    android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1"/>

packages/SettingsLib/SettingsTransition/res/values/dimens.xml

deleted100644 → 0
+0 −19
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.

-->



<resources>

    <dimen name="settings_shared_axis_x_slide_distance">96dp</dimen>

</resources>
 
 No newline at end of file