resolve merge conflicts of a50a419b82 to ub-launcher3-master.
Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index ef1cf73..8538a1f 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -203,7 +203,7 @@
private void updateIconSize(float scale, int drawablePadding, Resources res,
DisplayMetrics dm) {
iconSizePx = (int) (Utilities.pxFromDp(inv.iconSize, dm) * scale);
- iconTextSizePx = (int) (Utilities.pxFromDp(inv.iconTextSize, dm) * scale);
+ iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);
iconDrawablePaddingPx = drawablePadding;
hotseatIconSizePx = (int) (Utilities.pxFromDp(inv.hotseatIconSize, dm) * scale);
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 0a26109..ad959ef 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -27,6 +27,7 @@
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.PackageInstallerCompat;
import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.util.ConfigMonitor;
import com.android.launcher3.util.TestingUtils;
import com.android.launcher3.util.Thunk;
@@ -108,7 +109,6 @@
sContext.registerReceiver(mModel, filter);
UserManagerCompat.getInstance(sContext).enableAndResetCache();
-
if (!Utilities.ATLEAST_KITKAT) {
sContext.registerReceiver(new BroadcastReceiver() {
@@ -118,6 +118,7 @@
}
}, new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
}
+ new ConfigMonitor(sContext).register();
}
/**
diff --git a/src/com/android/launcher3/util/ConfigMonitor.java b/src/com/android/launcher3/util/ConfigMonitor.java
new file mode 100644
index 0000000..c61fa88
--- /dev/null
+++ b/src/com/android/launcher3/util/ConfigMonitor.java
@@ -0,0 +1,55 @@
+package com.android.launcher3.util;
+
+/**
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.util.Log;
+
+/**
+ * {@link BroadcastReceiver} which watches configuration changes and
+ * restarts the process in case changes which affect the device profile.
+ */
+public class ConfigMonitor extends BroadcastReceiver {
+
+ private final Context mContext;
+ private final float mFontScale;
+
+ public ConfigMonitor(Context context) {
+ mContext = context;
+
+ Configuration config = context.getResources().getConfiguration();
+ mFontScale = config.fontScale;
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ Configuration config = context.getResources().getConfiguration();
+ if (mFontScale != config.fontScale) {
+ Log.d("ConfigMonitor", "Configuration changed, restarting launcher");
+ mContext.unregisterReceiver(this);
+ android.os.Process.killProcess(android.os.Process.myPid());
+ }
+ }
+
+ public void register() {
+ mContext.registerReceiver(this, new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED));
+ }
+}