Skip to content

Commit e6c0370

Browse files
committed
Improve AutoSize#cancelAdapt(Activity)
1 parent e2c0b2d commit e6c0370

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

autosize/src/main/java/me/jessyan/autosize/AutoSize.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,20 @@ public static void autoConvertDensity(Activity activity, float sizeInDp, boolean
210210
* @param activity {@link Activity}
211211
*/
212212
public static void cancelAdapt(Activity activity) {
213+
float initXdpi = AutoSizeConfig.getInstance().getInitXdpi();
214+
switch (AutoSizeConfig.getInstance().getUnitsManager().getSupportSubunits()) {
215+
case PT:
216+
initXdpi = initXdpi / 72f;
217+
break;
218+
case MM:
219+
initXdpi = initXdpi / 25.4f;
220+
break;
221+
default:
222+
}
213223
setDensity(activity, AutoSizeConfig.getInstance().getInitDensity()
214224
, AutoSizeConfig.getInstance().getInitDensityDpi()
215225
, AutoSizeConfig.getInstance().getInitScaledDensity()
216-
, AutoSizeConfig.getInstance().getInitXdpi());
226+
, initXdpi);
217227
}
218228

219229
/**
@@ -286,7 +296,6 @@ private static void setDensity(DisplayMetrics displayMetrics, float density, int
286296
displayMetrics.xdpi = xdpi * 25.4f;
287297
break;
288298
default:
289-
break;
290299
}
291300
}
292301

0 commit comments

Comments
 (0)