PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply proper backward and forward transitions

Browse Source 
Currently, we hardcode TRANSITION_FADE_THROUGH because it is the default
as of now and it is also what Settings uses. It appears to match stock's
transition animations, too.

Issue: calyxos#1743
Change-Id: Iffe19e5b4fd552aab6c5a93bc3788a27b5eba00b
This commit is contained in:
Oliver Scott
2024-04-11 23:09:22 -04:00
committed by Michael Bestas
parent 8b77e3eea4
commit 8792be5031
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
View File

@@ -15,7 +15,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.ActivityManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -38,13 +37,12 @@ import com.android.settingslib.Utils;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;
import com.google.android.setupdesign.transition.TransitionHelper;
import com.google.android.setupdesign.util.ThemeHelper; import com.google.android.setupdesign.util.ThemeHelper;
import org.lineageos.setupwizard.NavigationLayout.NavigationBarListener; import org.lineageos.setupwizard.NavigationLayout.NavigationBarListener;
import org.lineageos.setupwizard.util.SetupWizardUtils; import org.lineageos.setupwizard.util.SetupWizardUtils;
import java.util.List;
public abstract class BaseSetupWizardActivity extends AppCompatActivity implements public abstract class BaseSetupWizardActivity extends AppCompatActivity implements
NavigationBarListener { NavigationBarListener {
@@ -87,6 +85,8 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
Log.v(TAG, "handleOnBackPressed()"); Log.v(TAG, "handleOnBackPressed()");
} }
finishAction(RESULT_CANCELED, new Intent().putExtra("onBackPressed", true)); finishAction(RESULT_CANCELED, new Intent().putExtra("onBackPressed", true));
TransitionHelper.applyBackwardTransition(BaseSetupWizardActivity.this,
TransitionHelper.TRANSITION_FADE_THROUGH, true);
} }
}); });
} }
@@ -276,6 +276,8 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true); intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V4); intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V4);
super.startActivity(intent); super.startActivity(intent);
TransitionHelper.applyForwardTransition(this,
TransitionHelper.TRANSITION_FADE_THROUGH, true);
} }
protected final void startActivityForResult(@NonNull Intent intent) { protected final void startActivityForResult(@NonNull Intent intent) {
@@ -283,6 +285,8 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true); intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V4); intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V4);
activityResultLauncher.launch(intent); activityResultLauncher.launch(intent);
TransitionHelper.applyForwardTransition(this,
TransitionHelper.TRANSITION_FADE_THROUGH, true);
} }
protected void onActivityResult(ActivityResult activityResult) { protected void onActivityResult(ActivityResult activityResult) {

4
src/org/lineageos/setupwizard/SubBaseActivity.java
View File

@@ -19,6 +19,8 @@ import android.util.Log;
import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResult;
import com.google.android.setupdesign.transition.TransitionHelper;
public abstract class SubBaseActivity extends BaseSetupWizardActivity { public abstract class SubBaseActivity extends BaseSetupWizardActivity {
public static final String TAG = SubBaseActivity.class.getSimpleName(); public static final String TAG = SubBaseActivity.class.getSimpleName();
@@ -80,6 +82,8 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
finishAction(RESULT_ACTIVITY_NOT_FOUND); finishAction(RESULT_ACTIVITY_NOT_FOUND);
} else if (data != null && data.getBooleanExtra("onBackPressed", false)) { } else if (data != null && data.getBooleanExtra("onBackPressed", false)) {
onStartSubactivity(); onStartSubactivity();
TransitionHelper.applyBackwardTransition(this,
TransitionHelper.TRANSITION_FADE_THROUGH, true);
} else { } else {
finishAction(RESULT_CANCELED); finishAction(RESULT_CANCELED);
} }