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

Merge "Readd predictive back developer setting" into main

Browse Source
This commit is contained in:
Johannes Gallmann
2023-12-14 08:01:51 +00:00
committed by Android (Google) Code Review
parent ced34f8672 bc669dc879
commit f9cea6549a
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/xml/development_settings.xml
View File

@@ -727,11 +727,10 @@
android:title="@string/enable_non_resizable_multi_window"
android:summary="@string/enable_non_resizable_multi_window_summary" />
// TODO(b/315859328): Temporally removed since causing search indexing failure.
<!-- <SwitchPreferenceCompat-->
<!-- android:key="back_navigation_animation"-->
<!-- android:title="@string/back_navigation_animation"-->
<!-- android:summary="@string/back_navigation_animation_summary" />-->
<SwitchPreferenceCompat
android:key="back_navigation_animation"
android:title="@string/back_navigation_animation"
android:summary="@string/back_navigation_animation_summary" />
<Preference
android:key="reset_shortcut_manager_throttling"

6
src/com/android/settings/development/BackAnimationPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.development;
import static com.android.window.flags.Flags.predictiveBackSystemAnimations;
import android.annotation.Nullable;
import android.content.Context;
import android.provider.Settings;
@@ -28,8 +29,6 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import java.util.Objects;
/**
* PreferenceController for enabling/disabling animation related to back button and back gestures.
*/
@@ -51,9 +50,8 @@ public class BackAnimationPreferenceController extends DeveloperOptionsPreferenc
public BackAnimationPreferenceController(Context context,
DevelopmentSettingsDashboardFragment fragment) {
@Nullable DevelopmentSettingsDashboardFragment fragment) {
super(context);
Objects.requireNonNull(fragment);
mFragment = fragment;
}

2
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -737,7 +737,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new OverlaySettingsPreferenceController(context));
controllers.add(new StylusHandwritingPreferenceController(context));
controllers.add(new IngressRateLimitPreferenceController((context)));
// controllers.add(new BackAnimationPreferenceController(context, fragment));
controllers.add(new BackAnimationPreferenceController(context, fragment));
controllers.add(new PhantomProcessPreferenceController(context));
controllers.add(new ContrastPreferenceController(
context, context.getSystemService(UiModeManager.class)));