aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-17 17:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Adding some logging around launcher grid when device profile changes"" into ub-launcher3-dorval

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-27 17:21:48 +00:00
committed by Android (Google) Code Review
parent 0d7f19a566 4610324261
commit 40dfa3bf6e
3 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/InvariantDeviceProfile.java
View File

@@ -29,7 +29,6 @@ import android.view.WindowManager;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.config.ProviderConfig;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.util.Thunk;
import org.xmlpull.v1.XmlPullParser;
@@ -188,23 +187,6 @@ public class InvariantDeviceProfile {
}
}
public void dumpDisplayInfo(Context context) {
WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
Display display = wm.getDefaultDisplay();
DisplayMetrics dm = new DisplayMetrics();
display.getMetrics(dm);
Point smallestSize = new Point();
Point largestSize = new Point();
display.getCurrentSizeRange(smallestSize, largestSize);
FileLog.e("DisplayInfo", "Default Density: " + DisplayMetrics.DENSITY_DEFAULT);
FileLog.e("DisplayInfo", "Density: " + dm.densityDpi);
FileLog.e("DisplayInfo", "Smallest size: " + smallestSize);
FileLog.e("DisplayInfo", "Largest size: " + largestSize);
FileLog.e("DisplayInfo", "minWidth/Height DPS: " + minWidthDps + ", " + minHeightDps);
}
ArrayList<InvariantDeviceProfile> getPredefinedDeviceProfiles(Context context) {
ArrayList<InvariantDeviceProfile> profiles = new ArrayList<>();
try (XmlResourceParser parser = context.getResources().getXml(R.xml.device_profiles)) {

3
src/com/android/launcher3/LauncherAppState.java
View File

@@ -28,7 +28,6 @@ import com.android.launcher3.compat.PackageInstallerCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.config.ProviderConfig;
import com.android.launcher3.dynamicui.ExtractionUtils;
import com.android.launcher3.model.GridSizeMigrationTask;
import com.android.launcher3.util.ConfigMonitor;
import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.TestingUtils;
@@ -54,8 +53,6 @@ public class LauncherAppState {
if (INSTANCE == null) {
if (Looper.myLooper() == Looper.getMainLooper()) {
INSTANCE = new LauncherAppState(context.getApplicationContext());
GridSizeMigrationTask.logDeviceProfileIfChanged(
INSTANCE.getInvariantDeviceProfile(), context);
} else {
try {
return new MainThreadExecutor().submit(new Callable<LauncherAppState>() {

18
src/com/android/launcher3/model/GridSizeMigrationTask.java
View File

@@ -27,7 +27,6 @@ import com.android.launcher3.Workspace;
import com.android.launcher3.compat.AppWidgetManagerCompat;
import com.android.launcher3.compat.PackageInstallerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.util.GridOccupancy;
import com.android.launcher3.util.LongArrayMap;
@@ -890,23 +889,6 @@ public class GridSizeMigrationTask {
.apply();
}
public static void logDeviceProfileIfChanged(InvariantDeviceProfile idp, Context context) {
SharedPreferences prefs = Utilities.getPrefs(context);
String gridSizeString = getPointString(idp.numColumns, idp.numRows);
int oldHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons);
String oldSize = prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, gridSizeString);
if (gridSizeString.equals(oldSize) && idp.numHotseatIcons == oldHotseatCount) {
// Skip if workspace and hotseat sizes have not changed.
return;
}
FileLog.e(TAG, "Grid size changed" + gridSizeString);
FileLog.e(TAG, " oldSize: " + oldSize + " , hotseat: " + oldHotseatCount);
FileLog.e(TAG, " newSize: " + gridSizeString + " , hotseat: " + idp.numHotseatIcons);
idp.dumpDisplayInfo(context);
}
/**
* Migrates the workspace and hotseat in case their sizes changed.
* @return false if the migration failed.