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

Merge "Update lottie illustration for tablet" into tm-qpr-dev am: b5215abde7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154459

Change-Id: If11468af414a092695276e4040f735fc88245828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edgar Wang
2023-02-01 10:45:19 +00:00
committed by Automerger Merge Worker
parent f691b4302d b5215abde7
commit 366ed57197
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.gestures;
import static android.os.UserHandle.USER_CURRENT;
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
@@ -74,6 +75,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
private static final String KEY_SHOW_A11Y_TUTORIAL_DIALOG = "show_a11y_tutorial_dialog_bool";
private static final int MIN_LARGESCREEN_WIDTH_DP = 600;
private boolean mA11yTutorialDialogShown = false;
private IOverlayManager mOverlayManager;
@@ -112,6 +115,11 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
ServiceManager.getService(Context.OVERLAY_SERVICE));
mVideoPreference = new IllustrationPreference(context);
Context windowContext = context.createWindowContext(TYPE_APPLICATION_OVERLAY, null);
if (windowContext.getResources()
.getConfiguration().smallestScreenWidthDp >= MIN_LARGESCREEN_WIDTH_DP) {
mVideoPreference.applyDynamicColor();
}
setIllustrationVideo(mVideoPreference, getDefaultKey());
migrateOverlaySensitivityToSettings(context, mOverlayManager);

13
src/com/android/settings/notification/BubbleNotificationIllustrationPreferenceController.java
View File

@@ -18,11 +18,7 @@ package com.android.settings.notification;
import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.IllustrationPreference;
import com.android.settingslib.widget.LottieColorUtils;
/**
* Controller for the illustration shown for the feature level settings screen for bubbles.
@@ -37,13 +33,4 @@ public class BubbleNotificationIllustrationPreferenceController extends BasePref
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
IllustrationPreference illustrationPreference = screen.findPreference(getPreferenceKey());
illustrationPreference.setOnBindListener(animationView -> {
LottieColorUtils.applyDynamicColors(mContext, animationView);
});
}
}