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

Commit 1aba4603 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9420665 from 04c89fe3 to tm-qpr2-release

Change-Id: I90e71440182c2de80a7e4fa6f58e07b20d5b360c
parents 69b1c517 04c89fe3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@
    <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/>
    <uses-permission android:name="android.permission.MONITOR_INPUT"/>
    <uses-permission android:name="android.permission.ALLOW_SLIPPERY_TOUCHES"/>
    <uses-permission android:name="android.permission.ACCESS_SHORTCUTS"/>

    <uses-permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY" />

+1 −3
Original line number Diff line number Diff line
@@ -76,10 +76,8 @@
    <dimen name="gesture_tutorial_taskbar_padding_start_end">218dp</dimen>

    <!--  Taskbar 3 button spacing  -->
    <dimen name="taskbar_button_margin_5_5">94.5dp</dimen>
    <dimen name="taskbar_button_margin_split">88dp</dimen>
    <dimen name="taskbar_button_margin_6_5">219.6dp</dimen>
    <dimen name="taskbar_button_margin_4_5">84dp</dimen>
    <dimen name="taskbar_button_margin_4_4">79dp</dimen>
    <dimen name="taskbar_contextual_button_margin">48dp</dimen>
    <dimen name="taskbar_suw_frame">96dp</dimen>
    <dimen name="taskbar_suw_insets">24dp</dimen>
+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@
    <string name="stats_log_manager_class" translatable="false">com.android.quickstep.logging.StatsLogCompatManager</string>
    <string name="test_information_handler_class" translatable="false">com.android.quickstep.QuickstepTestInformationHandler</string>
    <string name="window_manager_proxy_class" translatable="false">com.android.quickstep.util.SystemWindowManagerProxy</string>
    <string name="widget_holder_factory_class" translatable="false">com.android.launcher3.uioverrides.QuickstepWidgetHolder$QuickstepHolderFactory</string>

    <!-- The number of thumbnails and icons to keep in the cache. The thumbnail cache size also
         determines how many thumbnails will be fetched in the background. -->
+2 −4
Original line number Diff line number Diff line
@@ -303,11 +303,9 @@
    <!--  Taskbar 3 button spacing  -->
    <dimen name="taskbar_button_space_inbetween">24dp</dimen>
    <dimen name="taskbar_button_space_inbetween_phone">40dp</dimen>
    <dimen name="taskbar_button_margin_5_5">26dp</dimen>
    <dimen name="taskbar_button_margin_split">48dp</dimen>
    <dimen name="taskbar_button_margin_6_5">75dp</dimen>
    <dimen name="taskbar_button_margin_4_5">47dp</dimen>
    <dimen name="taskbar_button_margin_4_4">47dp</dimen>
    <dimen name="taskbar_button_margin_default">47dp</dimen>
    <dimen name="taskbar_button_margin_default">48dp</dimen>

    <!-- Launcher splash screen -->
    <!-- Note: keep this value in sync with the WindowManager/Shell dimens.xml -->
+18 −16
Original line number Diff line number Diff line
@@ -152,10 +152,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
            TaskbarNavButtonController buttonController, ScopedUnfoldTransitionProgressProvider
            unfoldTransitionProgressProvider) {
        super(windowContext);
        mDeviceProfile = launcherDp.copy(this);

        final Resources resources = getResources();

        matchDeviceProfile(launcherDp, getResources());

        mNavMode = DisplayController.getNavigationMode(windowContext);
        mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, resources, false);
        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
@@ -170,8 +170,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
        mIsNavBarKidsMode = settingsCache.getValue(
                Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 0);

        updateIconSize(resources);

        // Get display and corners first, as views might use them in constructor.
        Display display = windowContext.getDisplay();
        Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY
@@ -259,8 +257,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
    public void updateDeviceProfile(DeviceProfile launcherDp, NavigationMode navMode) {
        mNavMode = navMode;
        mControllers.taskbarOverlayController.updateLauncherDeviceProfile(launcherDp);
        mDeviceProfile = launcherDp.copy(this);
        updateIconSize(getResources());
        matchDeviceProfile(launcherDp, getResources());

        AbstractFloatingView.closeAllOpenViewsExcept(this, false, TYPE_REBIND_SAFE);
        // Reapply fullscreen to take potential new screen size into account.
@@ -269,6 +266,21 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
        dispatchDeviceProfileChanged();
    }

    /**
     * Copy the original DeviceProfile, match the number of hotseat icons and qsb width and update
     * the icon size
     */
    private void matchDeviceProfile(DeviceProfile originDeviceProfile, Resources resources) {
        mDeviceProfile = originDeviceProfile.copy(this);
        // Taskbar should match the number of icons of hotseat
        mDeviceProfile.numShownHotseatIcons = originDeviceProfile.numShownHotseatIcons;
        // Same QSB width to have a smooth animation
        mDeviceProfile.hotseatQsbWidth = originDeviceProfile.hotseatQsbWidth;
        // Update the size of the icons
        updateIconSize(resources);
    }


    private void updateIconSize(Resources resources) {
        mDeviceProfile.iconSizePx = resources.getDimensionPixelSize(
                DisplayController.isTransientTaskbar(this)
@@ -876,16 +888,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
        mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false);
    }

    /** Called when we want to hide the overlay window when user performs swipe up gesture. */
    public void onSwipeToHideOverlay() {
        mControllers.taskbarOverlayController.hideWindow();
    }

    /** Returns {@code true} if taskbar is stashed. */
    public boolean isTaskbarStashed() {
        return mControllers.taskbarStashController.isStashed();
    }

    /** Returns {@code true} if taskbar All Apps is open. */
    public boolean isTaskbarAllAppsOpen() {
        return mControllers.taskbarAllAppsController.isOpen();
Loading