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

Commit 3f7a6935 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug resolving the correct icon/logo in action bars"

parents f0308dc8 04fe6ebb

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -6808,6 +6808,7 @@ package android.content.pm { 
    ctor public ComponentInfo(android.content.pm.ComponentInfo);

    ctor protected ComponentInfo(android.os.Parcel);

    method public final int getIconResource();

    method public final int getLogoResource();

    method public boolean isEnabled();

    field public android.content.pm.ApplicationInfo applicationInfo;

    field public int descriptionRes;
@@ -27040,7 +27041,9 @@ package android.view { 
    method public void setFlags(int, int);

    method public void setFormat(int);

    method public void setGravity(int);

    method public void setIcon(int);

    method public void setLayout(int, int);

    method public void setLogo(int);

    method public void setSoftInputMode(int);

    method public abstract void setTitle(java.lang.CharSequence);

    method public abstract void setTitleColor(int);

core/java/android/app/Activity.java

+4 −1
Original line number Diff line number Diff line
@@ -1880,6 +1880,9 @@ public class Activity extends ContextThemeWrapper 


        mActionBar = new ActionBarImpl(this);

        mActionBar.setDefaultDisplayHomeAsUpEnabled(mEnableDefaultActionBarUp);



        mWindow.setDefaultIcon(mActivityInfo.getIconResource());

        mWindow.setDefaultLogo(mActivityInfo.getLogoResource());

    }

    

    /**

core/java/android/app/Dialog.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.app;



import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import com.android.internal.app.ActionBarImpl;

import com.android.internal.policy.PolicyManager;
@@ -264,6 +266,9 @@ public class Dialog implements DialogInterface, Window.Callback, 
        mDecor = mWindow.getDecorView();



        if (mActionBar == null && mWindow.hasFeature(Window.FEATURE_ACTION_BAR)) {

            final ApplicationInfo info = mContext.getApplicationInfo();

            mWindow.setDefaultIcon(info.icon);

            mWindow.setDefaultLogo(info.logo);

            mActionBar = new ActionBarImpl(this);

        }

core/java/android/content/pm/ComponentInfo.java

+11 −0
Original line number Diff line number Diff line
@@ -117,6 +117,17 @@ public class ComponentInfo extends PackageItemInfo { 
        return icon != 0 ? icon : applicationInfo.icon;

    }



    /**

     * Return the logo resource identifier to use for this component.  If

     * the component defines a logo, that is used; else, the application

     * logo is used.

     *

     * @return The logo associated with this component.

     */

    public final int getLogoResource() {

        return logo != 0 ? logo : applicationInfo.logo;

    }

    

    protected void dumpFront(Printer pw, String prefix) {

        super.dumpFront(pw, prefix);

        pw.println(prefix + "enabled=" + enabled + " exported=" + exported

core/java/android/view/IWindowManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ interface IWindowManager 
    void executeAppTransition();

    void setAppStartingWindow(IBinder token, String pkg, int theme,

            in CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,

            int icon, int windowFlags, IBinder transferFrom, boolean createIfNeeded);

            int icon, int logo, int windowFlags, IBinder transferFrom, boolean createIfNeeded);

    void setAppWillBeHidden(IBinder token);

    void setAppVisibility(IBinder token, boolean visible);

    void startAppFreezingScreen(IBinder token, int configChanges);