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

Commit 32c687c2 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25351 into eclair 

* changes:
  Change Theme.Light's background back to pure white.
parents 4295613a d03b8808

core/java/android/view/LayoutInflater.java

+4 −3
Original line number Diff line number Diff line
@@ -458,11 +458,12 @@ public abstract class LayoutInflater { 
    public final View createView(String name, String prefix, AttributeSet attrs)

            throws ClassNotFoundException, InflateException {

        Constructor constructor = sConstructorMap.get(name);

        Class clazz = null;



        try {

            if (constructor == null) {

                // Class not found in the cache, see if it's real, and try to add it

                Class clazz = mContext.getClassLoader().loadClass(

                clazz = mContext.getClassLoader().loadClass(

                        prefix != null ? (prefix + name) : name);

                

                if (mFilter != null && clazz != null) {
@@ -480,7 +481,7 @@ public abstract class LayoutInflater { 
                    Boolean allowedState = mFilterMap.get(name);

                    if (allowedState == null) {

                        // New class -- remember whether it is allowed

                        Class clazz = mContext.getClassLoader().loadClass(

                        clazz = mContext.getClassLoader().loadClass(

                                prefix != null ? (prefix + name) : name);

                        

                        boolean allowed = clazz != null && mFilter.onLoadClass(clazz);
@@ -511,7 +512,7 @@ public abstract class LayoutInflater { 
        } catch (Exception e) {

            InflateException ie = new InflateException(attrs.getPositionDescription()

                    + ": Error inflating class "

                    + (constructor == null ? "<unknown>" : constructor.getClass().getName()));

                    + (clazz == null ? "<unknown>" : clazz.getName()));

            ie.initCause(e);

            throw ie;

        }

core/res/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
*/

-->

<resources>

	<drawable name="screen_background_light">#fff9f9f9</drawable>

	<drawable name="screen_background_light">#ffffffff</drawable>

	<drawable name="screen_background_dark">#ff202020</drawable>

    <drawable name="status_bar_closed_default_background">#ff000000</drawable>

    <drawable name="status_bar_opened_default_background">#ff000000</drawable>
@@ -45,7 +45,7 @@ 
    <color name="dim_foreground_dark_inverse">#323232</color>

    <color name="dim_foreground_dark_inverse_disabled">#80323232</color>

    <color name="hint_foreground_dark">#808080</color>

    <color name="background_light">#fff9f9f9</color>

    <color name="background_light">#ffffffff</color>

    <color name="bright_foreground_light">#ff000000</color>

    <color name="bright_foreground_light_inverse">#ffffffff</color>

    <color name="bright_foreground_light_disabled">#80000000</color>