diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
old mode 100644
new mode 100755
index 86d6ee7..ef209c5
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -23,6 +23,7 @@ import android.text.TextUtils;
import android.view.View;
import java.util.Locale;
+import android.os.*;
/**
* This class describes all device configuration information that can
@@ -721,7 +722,18 @@ public final class Configuration implements Parcelable, Comparable<Configuration
* Set this object to the system defaults.
*/
public void setToDefaults() {
- fontScale = 1;
+
+ String scale = Build.DEFAULT_FONTSCALE;
+ if ( scale.equalsIgnoreCase( Build.UNKNOWN ) == false )
+ {
+ fontScale = Float.valueOf( Build.DEFAULT_FONTSCALE ).floatValue();
+ }
+ else
+ {
+ fontScale = 1.0f;
+ }
+
+
mcc = mnc = 0;
locale = null;
userSetLocale = false;
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 25e76c4..920b691 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -65,6 +65,9 @@ public class Build {
/**a property to tablet systemUI */
public static final String TABLETUI = getString("ro.property.tabletUI");
+ /**a property to tablet systemUI */
+ public static final String DEFAULT_FONTSCALE = getString("ro.property.fontScale");
+
/**
* The radio firmware version number.
old mode 100644
new mode 100755
index 86d6ee7..ef209c5
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -23,6 +23,7 @@ import android.text.TextUtils;
import android.view.View;
import java.util.Locale;
+import android.os.*;
/**
* This class describes all device configuration information that can
@@ -721,7 +722,18 @@ public final class Configuration implements Parcelable, Comparable<Configuration
* Set this object to the system defaults.
*/
public void setToDefaults() {
- fontScale = 1;
+
+ String scale = Build.DEFAULT_FONTSCALE;
+ if ( scale.equalsIgnoreCase( Build.UNKNOWN ) == false )
+ {
+ fontScale = Float.valueOf( Build.DEFAULT_FONTSCALE ).floatValue();
+ }
+ else
+ {
+ fontScale = 1.0f;
+ }
+
+
mcc = mnc = 0;
locale = null;
userSetLocale = false;
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 25e76c4..920b691 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -65,6 +65,9 @@ public class Build {
/**a property to tablet systemUI */
public static final String TABLETUI = getString("ro.property.tabletUI");
+ /**a property to tablet systemUI */
+ public static final String DEFAULT_FONTSCALE = getString("ro.property.fontScale");
+
/**
* The radio firmware version number.
*
make的时候我们需要先make update-api