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

Commit 8da1cac6 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Revert "Reland "Add logs for InvariantDeviceProfile.getDeviceProfile""" into tm-qpr-dev

parents b3a95149 eabf2c39

src/com/android/launcher3/InvariantDeviceProfile.java

+0 −15
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3; 


import static com.android.launcher3.LauncherPrefs.GRID_NAME;

import static com.android.launcher3.Utilities.dpiFromPx;

import static com.android.launcher3.config.FeatureFlags.ENABLE_DEVICE_PROFILE_LOGGING;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;

import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE;

import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
@@ -70,8 +69,6 @@ import org.xmlpull.v1.XmlPullParser; 
import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;

import java.io.PrintWriter;

import java.io.StringWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;
@@ -680,18 +677,6 @@ public class InvariantDeviceProfile { 
        float screenHeight = config.screenHeightDp * res.getDisplayMetrics().density;

        int rotation = WindowManagerProxy.INSTANCE.get(context).getRotation(context);



        if (Utilities.IS_DEBUG_DEVICE && ENABLE_DEVICE_PROFILE_LOGGING.get()) {

            StringWriter stringWriter = new StringWriter();

            PrintWriter printWriter = new PrintWriter(stringWriter);

            DisplayController.INSTANCE.get(context).dump(printWriter);

            printWriter.flush();

            Log.d("b/253338238", "getDeviceProfile -"

                            + "\nconfig: " + config

                            + "\ndisplayMetrics: " + res.getDisplayMetrics()

                            + "\nrotation: " + rotation

                            + "\n" + stringWriter,

                    new Exception());

        }

        return getBestMatch(screenWidth, screenHeight, rotation);

    }

src/com/android/launcher3/config/FeatureFlags.java

+0 −3
Original line number Diff line number Diff line
@@ -348,9 +348,6 @@ public final class FeatureFlags { 
            "ENABLE_NEW_GESTURE_NAV_TUTORIAL", false,

            "Enable the redesigned gesture navigation tutorial");



    public static final BooleanFlag ENABLE_DEVICE_PROFILE_LOGGING = new DeviceFlag(

            "ENABLE_DEVICE_PROFILE_LOGGING", false, "Allows DeviceProfile logging");



    public static final BooleanFlag ENABLE_LAUNCH_FROM_STAGED_APP = getDebugFlag(

            "ENABLE_LAUNCH_FROM_STAGED_APP", true,

            "Enable the ability to tap a staged app during split select to launch it in full screen"