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

Commit 6040c2ae authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'themes-2.3.1_r1' of... 

Merge branch 'themes-2.3.1_r1' of https://github.com/tmobile/themes-platform-frameworks-base into HEAD
parents 059928a4 b0e06495

core/java/android/app/ContextImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ class ContextImpl extends Context { 
            if (mThemeResource == 0) {

                mThemeResource = com.android.internal.R.style.Theme;

            }



            mTheme = mResources.newTheme();

            mTheme.applyStyle(mThemeResource, true);

        }

core/java/android/content/pm/ThemeInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.content.res.Resources; 
 *        pluto:ringtoneFileName="media/audio/ringtone.mp3"

 *        pluto:notificationRingtoneFileName="media/audio/locked/notification.mp3"

 *        pluto:copyright="T-Mobile, 2009"

 *        pluto:wallpaperImage="media/images/wallpaper.jpg"

 *    />

 *

 * @hide

core/java/android/content/res/AssetManager.java

+2 −8
Original line number Diff line number Diff line
@@ -659,8 +659,8 @@ public final class AssetManager { 


    /**

     * Delete a set of assets from the asset manager. Not for use by

     * applications. Returns true if succeeded or false on failure. {@hide

     * }

     * applications. Returns true if succeeded or false on failure.

     * {@hide}

     */

    public native final boolean removeAssetPath(String packageName, int cookie);
@@ -673,12 +673,6 @@ public final class AssetManager { 
     */

    public native final int updateResourcesWithAssetPath(String path);



    /**

     * Debug method to dump resource information.

     * {@hide}

     */

    public native final void dumpResources();



    /**

     * Sets a flag indicating that this AssetManager should have themes

     * attached, according to the initial request to create it by the

core/java/android/content/res/CustomTheme.java

+7 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.content.res;



import android.os.SystemProperties;

import android.text.TextUtils;



/**

 * @hide
@@ -73,12 +74,14 @@ public final class CustomTheme implements Cloneable { 
    @Override

    public final String toString() {

        StringBuilder result = new StringBuilder();

        result.append(mThemeId);

        result.append("_");

        if (mThemePackageName != null && mThemePackageName.length() > 0){

        if (!TextUtils.isEmpty(mThemePackageName) && !TextUtils.isEmpty(mThemeId)) {

            result.append(mThemePackageName);

            result.append('(');

            result.append(mThemeId);

            result.append(')');

        } else {

            result.append("system");

        }



        return result.toString();

    }

core/java/android/widget/LinearLayout.java

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * This code has been modified.  Portions copyright (C) 2010, T-Mobile USA, Inc.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -118,15 +117,10 @@ public class LinearLayout extends ViewGroup { 
    }



    public LinearLayout(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

    }

    

    /** @hide pending api review */

    public LinearLayout(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        super(context, attrs);



        TypedArray a = 

            context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.LinearLayout, defStyle, 0);

            context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.LinearLayout);



        int index = a.getInt(com.android.internal.R.styleable.LinearLayout_orientation, -1);

        if (index >= 0) {