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

Commit 6fff487e authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Merge branch 'themes-1.5r2' into themes-eclair 

Conflicts:
	api/current.xml
	core/java/android/app/ActivityThread.java
	core/java/android/app/ApplicationContext.java
	core/java/android/app/Dialog.java
	core/java/android/app/SearchDialog.java
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/pm/PackageParser.java
	core/java/android/content/res/Configuration.java
	core/java/android/content/res/Resources.java
	core/java/android/widget/RemoteViews.java
	core/java/android/widget/TabWidget.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/jni/android_util_AssetManager.cpp
	core/res/AndroidManifest.xml
	core/res/res/layout/search_dropdown_item_2line.xml
	core/res/res/layout/select_dialog_item.xml
	core/res/res/layout/select_dialog_multichoice.xml
	core/res/res/layout/select_dialog_singlechoice.xml
	core/res/res/layout/tab_indicator.xml
	core/res/res/values/attrs.xml
	core/res/res/values/public.xml
	core/res/res/values/strings.xml
	core/res/res/values/themes.xml
	libs/utils/Android.mk
	libs/utils/AssetManager.cpp
	media/java/android/media/RingtoneManager.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/status/StatusBarService.java
	tools/aapt/Main.cpp
parents 9db3d07b 9effa6db

api/current.xml

+542 −0
Original line number Diff line number Diff line
@@ -1758,6 +1758,17 @@ 
 visibility="public"

>

</field>

<field name="alertDialogTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843448"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="allowBackup"

 type="int"

 transient="false"
@@ -2110,6 +2121,17 @@ 
 visibility="public"

>

</field>

<field name="bottomLeftStrip"

 type="int"

 transient="false"

 volatile="false"

 value="16843451"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="bottomMedium"

 type="int"

 transient="false"
@@ -2143,6 +2165,17 @@ 
 visibility="public"

>

</field>

<field name="bottomRightStrip"

 type="int"

 transient="false"

 volatile="false"

 value="16843452"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="bufferType"

 type="int"

 transient="false"
@@ -2198,6 +2231,28 @@ 
 visibility="public"

>

</field>

<field name="buttonStyleTimePickerDown"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="buttonStyleTimePickerUp"

 type="int"

 transient="false"

 volatile="false"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="buttonStyleToggle"

 type="int"

 transient="false"
@@ -2913,6 +2968,17 @@ 
 visibility="public"

>

</field>

<field name="dialogTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843447"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="dialogTitle"

 type="int"

 transient="false"
@@ -3441,6 +3507,17 @@ 
 visibility="public"

>

</field>

<field name="expandedMenuTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843459"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="exported"

 type="int"

 transient="false"
@@ -4145,6 +4222,17 @@ 
 visibility="public"

>

</field>

<field name="iconMenuTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843460"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="iconPreview"

 type="int"

 transient="false"
@@ -5289,6 +5377,28 @@ 
 visibility="public"

>

</field>

<field name="listItemBackground"

 type="int"

 transient="false"

 volatile="false"

 value="16843446"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="listItemTextViewStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843450"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="listPreferredItemHeight"

 type="int"

 transient="false"
@@ -5520,6 +5630,17 @@ 
 visibility="public"

>

</field>

<field name="menuItemBackground"

 type="int"

 transient="false"

 volatile="false"

 value="16843458"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mimeType"

 type="int"

 transient="false"
@@ -6983,6 +7104,17 @@ 
 visibility="public"

>

</field>

<field name="searchDialogTheme"

 type="int"

 transient="false"

 volatile="false"

 value="16843449"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="searchMode"

 type="int"

 transient="false"
@@ -7742,6 +7874,17 @@ 
 visibility="public"

>

</field>

<field name="tabIndicatorStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843453"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="tabWidgetStyle"

 type="int"

 transient="false"
@@ -8061,6 +8204,17 @@ 
 visibility="public"

>

</field>

<field name="textAppearanceTab"

 type="int"

 transient="false"

 volatile="false"

 value="16843454"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="textCheckMark"

 type="int"

 transient="false"
@@ -8424,6 +8578,17 @@ 
 visibility="public"

>

</field>

<field name="timePickerInputStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843455"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="tint"

 type="int"

 transient="false"
@@ -13253,6 +13418,17 @@ 
 visibility="public"

>

</field>

<field name="Widget_EditText_TimePicker"

 type="int"

 transient="false"

 volatile="false"

 value="16973926"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_ExpandableListView"

 type="int"

 transient="false"
@@ -13495,6 +13671,17 @@ 
 visibility="public"

>

</field>

<field name="Widget_TabIndicator"

 type="int"

 transient="false"

 volatile="false"

 value="16973925"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_TabWidget"

 type="int"

 transient="false"
@@ -39818,6 +40005,17 @@ 
 visibility="public"

>

</field>

<field name="PLUTO_ISTHEMEABLE_ATTRIBUTE_NAME"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;isThemeable&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="className"

 type="java.lang.String"

 transient="false"
@@ -40006,6 +40204,234 @@ 
</parameter>

</method>

</class>

<class name="BaseThemeInfo"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="BaseThemeInfo"

 type="android.content.pm.BaseThemeInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</constructor>

<constructor name="BaseThemeInfo"

 type="android.content.pm.BaseThemeInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="source" type="android.os.Parcel">

</parameter>

</constructor>

<method name="changeDrmFlagIfNeeded"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="resourcePath" type="java.lang.String">

</parameter>

</method>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<field name="author"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="copyright"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="favesAppImageName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="favesImageName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="name"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="notificationRingtoneFileName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="notificationRingtoneName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="preview"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ringtoneFileName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ringtoneName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="soundPackName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="styleResourceId"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="themeId"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="themeStyleName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="thumbnail"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperImageName"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ComponentInfo"

 extends="android.content.pm.PackageItemInfo"

 abstract="false"
@@ -40748,6 +41174,16 @@ 
 visibility="public"

>

</field>

<field name="isThemeApk"

 type="boolean"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="packageName"

 type="java.lang.String"

 transient="false"
@@ -41412,6 +41848,17 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getInstalledThemePackages"

 return="java.util.List&lt;android.content.pm.PackageInfo&gt;"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getInstallerPackageName"

 return="java.lang.String"

 abstract="true"
@@ -43347,6 +43794,76 @@ 
>

</field>

</class>

<class name="SoundsInfo"

 extends="android.content.pm.BaseThemeInfo"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="SoundsInfo"

 type="android.content.pm.SoundsInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="parser" type="org.xmlpull.v1.XmlPullParser">

</parameter>

<parameter name="res" type="android.content.res.Resources">

</parameter>

<parameter name="attrs" type="android.util.AttributeSet">

</parameter>

<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">

</exception>

</constructor>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ThemeInfo"

 extends="android.content.pm.BaseThemeInfo"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="ThemeInfo"

 type="android.content.pm.ThemeInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="parser" type="org.xmlpull.v1.XmlPullParser">

</parameter>

<parameter name="res" type="android.content.res.Resources">

</parameter>

<parameter name="attrs" type="android.util.AttributeSet">

</parameter>

<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">

</exception>

</constructor>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.content.res"

>
@@ -132925,6 +133442,17 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getInstalledThemePackages"

 return="java.util.List&lt;android.content.pm.PackageInfo&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getInstallerPackageName"

 return="java.lang.String"

 abstract="false"
@@ -186340,6 +186868,20 @@ 
<parameter name="attrs" type="android.util.AttributeSet">

</parameter>

</constructor>

<constructor name="LinearLayout"

 type="android.widget.LinearLayout"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="attrs" type="android.util.AttributeSet">

</parameter>

<parameter name="defStyle" type="int">

</parameter>

</constructor>

<method name="getBaselineAlignedChildIndex"

 return="int"

 abstract="false"

core/java/android/app/ActivityManager.java

+24 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ConfigurationInfo;

import android.content.pm.IPackageDataObserver;

import android.content.res.Configuration;

import android.graphics.Bitmap;

import android.os.Debug;

import android.os.RemoteException;
@@ -923,4 +924,27 @@ public class ActivityManager { 
        return null;

    }

    

    /**

     * @hide

     */

    public Configuration getConfiguration() {

        try {

            return ActivityManagerNative.getDefault().getConfiguration();

        } catch (RemoteException e) {

            return null;

        }

    }



    /**

     * @throws SecurityException Throws SecurityException if the caller does

     * not hold the {@link android.Manifest.permission#CHANGE_CONFIGURATION} permission.

     *

     * @hide

     */

    public void updateConfiguration(Configuration values) throws SecurityException {

        try {

            ActivityManagerNative.getDefault().updateConfiguration(values);

        } catch (RemoteException e) {

        }

    }

}

core/java/android/app/ActivityThread.java

+137 −19

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/AlertDialog.java

+23 −15
Original line number Diff line number Diff line
@@ -56,19 +56,25 @@ public class AlertDialog extends Dialog implements DialogInterface { 
    private AlertController mAlert;



    protected AlertDialog(Context context) {

        this(context, com.android.internal.R.style.Theme_Dialog_Alert);

        this(context, 0);

    }



    protected AlertDialog(Context context, int theme) {

        super(context, theme);

        mAlert = new AlertController(context, this, getWindow());

        super(context, resolveDefaultTheme(context, theme));

        mAlert = new AlertController(getContext(), this, getWindow());

    }



    protected AlertDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {

        super(context, com.android.internal.R.style.Theme_Dialog_Alert);

        super(context, resolveDefaultTheme(context, 0));

        setCancelable(cancelable);

        setOnCancelListener(cancelListener);

        mAlert = new AlertController(context, this, getWindow());

        mAlert = new AlertController(getContext(), this, getWindow());

    }

    

    static int resolveDefaultTheme(Context context, int theme) {

        return Dialog.resolveDefaultTheme(context, theme,

                android.R.styleable.Theme_alertDialogTheme,

                com.android.internal.R.style.Theme_Dialog_Alert);

    }



    /**
@@ -264,13 +270,15 @@ public class AlertDialog extends Dialog implements DialogInterface { 
    }

    

    public static class Builder {

        private final Context mContext;

        private final AlertController.AlertParams P;

        

        /**

         * Constructor using a context for this builder and the {@link AlertDialog} it creates.

         */

        public Builder(Context context) {

            P = new AlertController.AlertParams(context);

            mContext = context;

            P = new AlertController.AlertParams();

        }

        

        /**
@@ -279,7 +287,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @return This Builder object to allow for chaining of calls to set methods

         */

        public Builder setTitle(int titleId) {

            P.mTitle = P.mContext.getText(titleId);

            P.mTitle = mContext.getText(titleId);

            return this;

        }
@@ -315,7 +323,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @return This Builder object to allow for chaining of calls to set methods

         */

        public Builder setMessage(int messageId) {

            P.mMessage = P.mContext.getText(messageId);

            P.mMessage = mContext.getText(messageId);

            return this;

        }
@@ -357,7 +365,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @return This Builder object to allow for chaining of calls to set methods

         */

        public Builder setPositiveButton(int textId, final OnClickListener listener) {

            P.mPositiveButtonText = P.mContext.getText(textId);

            P.mPositiveButtonText = mContext.getText(textId);

            P.mPositiveButtonListener = listener;

            return this;

        }
@@ -383,7 +391,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @return This Builder object to allow for chaining of calls to set methods

         */

        public Builder setNegativeButton(int textId, final OnClickListener listener) {

            P.mNegativeButtonText = P.mContext.getText(textId);

            P.mNegativeButtonText = mContext.getText(textId);

            P.mNegativeButtonListener = listener;

            return this;

        }
@@ -409,7 +417,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @return This Builder object to allow for chaining of calls to set methods

         */

        public Builder setNeutralButton(int textId, final OnClickListener listener) {

            P.mNeutralButtonText = P.mContext.getText(textId);

            P.mNeutralButtonText = mContext.getText(textId);

            P.mNeutralButtonListener = listener;

            return this;

        }
@@ -465,7 +473,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @return This Builder object to allow for chaining of calls to set methods

         */

        public Builder setItems(int itemsId, final OnClickListener listener) {

            P.mItems = P.mContext.getResources().getTextArray(itemsId);

            P.mItems = mContext.getResources().getTextArray(itemsId);

            P.mOnClickListener = listener;

            return this;

        }
@@ -538,7 +546,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         */

        public Builder setMultiChoiceItems(int itemsId, boolean[] checkedItems, 

                final OnMultiChoiceClickListener listener) {

            P.mItems = P.mContext.getResources().getTextArray(itemsId);

            P.mItems = mContext.getResources().getTextArray(itemsId);

            P.mOnCheckboxClickListener = listener;

            P.mCheckedItems = checkedItems;

            P.mIsMultiChoice = true;
@@ -617,7 +625,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         */

        public Builder setSingleChoiceItems(int itemsId, int checkedItem, 

                final OnClickListener listener) {

            P.mItems = P.mContext.getResources().getTextArray(itemsId);

            P.mItems = mContext.getResources().getTextArray(itemsId);

            P.mOnClickListener = listener;

            P.mCheckedItem = checkedItem;

            P.mIsSingleChoice = true;
@@ -783,7 +791,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * to do and want this to be created and displayed.

         */

        public AlertDialog create() {

            final AlertDialog dialog = new AlertDialog(P.mContext);

            final AlertDialog dialog = new AlertDialog(mContext);

            P.apply(dialog.mAlert);

            dialog.setCancelable(P.mCancelable);

            dialog.setOnCancelListener(P.mOnCancelListener);

core/java/android/app/ApplicationContext.java

+136 −8

File changed.

Preview size limit exceeded, changes collapsed.