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

Commit d6590d4c authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'ics-mr1-release' of... 

Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/frameworks/base into aosp

Conflicts:
	core/res/res/values-de/strings.xml
	core/res/res/values-el/strings.xml
	core/res/res/values-nl/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-tr/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values/config.xml
	data/fonts/Roboto-Bold.ttf
	data/fonts/Roboto-BoldItalic.ttf
	data/fonts/Roboto-Italic.ttf
	data/fonts/Roboto-Regular.ttf
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I376757e52555fe45860f404da5fd2293ea45ddce
parents 1e5dab5b df331873

api/15.txt

+2 −0
Original line number Diff line number Diff line
@@ -6611,6 +6611,7 @@ package android.content.res { 
    method public int getDimensionPixelSize(int) throws android.content.res.Resources.NotFoundException;

    method public android.util.DisplayMetrics getDisplayMetrics();

    method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;

    method public android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;

    method public float getFraction(int, int, int);

    method public int getIdentifier(java.lang.String, java.lang.String, java.lang.String);

    method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;
@@ -6633,6 +6634,7 @@ package android.content.res { 
    method public java.lang.CharSequence[] getTextArray(int) throws android.content.res.Resources.NotFoundException;

    method public void getValue(int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;

    method public final android.content.res.Resources.Theme newTheme();

    method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -6611,6 +6611,7 @@ package android.content.res { 
    method public int getDimensionPixelSize(int) throws android.content.res.Resources.NotFoundException;

    method public android.util.DisplayMetrics getDisplayMetrics();

    method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;

    method public android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;

    method public float getFraction(int, int, int);

    method public int getIdentifier(java.lang.String, java.lang.String, java.lang.String);

    method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;
@@ -6633,6 +6634,7 @@ package android.content.res { 
    method public java.lang.CharSequence[] getTextArray(int) throws android.content.res.Resources.NotFoundException;

    method public void getValue(int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;

    method public final android.content.res.Resources.Theme newTheme();

    method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);

cmds/dumpstate/dumpstate.c

+18 −0
Original line number Diff line number Diff line
@@ -108,6 +108,24 @@ static void dumpstate() { 
        dump_file("VM TRACES AT LAST ANR", anr_traces_path);

    }



    /* slow traces for slow operations */

    if (anr_traces_path[0] != 0) {

        int tail = strlen(anr_traces_path)-1;

        while (tail > 0 && anr_traces_path[tail] != '/') {

            tail--;

        }

        int i = 0;

        while (1) {

            sprintf(anr_traces_path+tail+1, "slow%02d.txt", i);

            if (stat(anr_traces_path, &st)) {

                // No traces file at this index, done with the files.

                break;

            }

            dump_file("VM TRACES WHEN SLOW", anr_traces_path);

            i++;

        }

    }



    // dump_file("EVENT LOG TAGS", "/etc/event-log-tags");

    run_command("EVENT LOG", 20, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL);

    run_command("RADIO LOG", 20, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);

core/java/android/animation/AnimatorSet.java

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ import java.util.List; 
 * result in none of the affected animations being played. Because of this (and because

 * circular dependencies do not make logical sense anyway), circular dependencies

 * should be avoided, and the dependency flow of animations should only be in one direction.

 *

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <p>For more information about animating with {@code AnimatorSet}, read the

 * <a href="{@docRoot}guide/topics/graphics/prop-animation.html#choreography">Property

 * Animation</a> developer guide.</p>

 * </div>

 */

public final class AnimatorSet extends Animator {

core/java/android/animation/ObjectAnimator.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ import java.util.ArrayList; 
 * are then determined internally and the animation will call these functions as necessary to

 * animate the property.

 *

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <p>For more information about animating with {@code ObjectAnimator}, read the

 * <a href="{@docRoot}guide/topics/graphics/prop-animation.html#object-animator">Property

 * Animation</a> developer guide.</p>

 * </div>

 *

 * @see #setPropertyName(String)

 *

 */