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

Commit aa737f80 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Support non-managed profile Status Bar icons"

parents 40273e68 de7843f5

core/java/android/os/IUserManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ interface IUserManager { 
    int getUserBadgeLabelResId(int userId);

    int getUserBadgeColorResId(int userId);

    int getUserBadgeDarkColorResId(int userId);

    int getUserStatusBarIconResId(int userId);

    boolean hasBadge(int userId);

    boolean isUserUnlocked(int userId);

    boolean isUserRunning(int userId);

core/java/android/os/UserManager.java

+15 −0
Original line number Diff line number Diff line
@@ -5350,6 +5350,21 @@ public class UserManager { 
        }

    }



    /**

     * Returns the Resource ID of the user's status bar icon.

     *

     * @return the Resource ID of the user's status bar icon if it has one; otherwise

     *         {@link Resources#ID_NULL}.

     * @hide

     */

    public @DrawableRes int getUserStatusBarIconResId(@UserIdInt int userId) {

        try {

            return mService.getUserStatusBarIconResId(userId);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * If the target user is a profile of the calling user or the caller

     * is itself a profile, then this returns a badged copy of the given

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1391,6 +1391,7 @@ 
  <java-symbol type="drawable" name="ic_corp_user_badge" />

  <java-symbol type="drawable" name="ic_corp_badge_no_background" />

  <java-symbol type="drawable" name="ic_corp_statusbar_icon" />

  <java-symbol type="drawable" name="stat_sys_managed_profile_status" />

  <java-symbol type="drawable" name="ic_test_badge_experiment" />

  <java-symbol type="drawable" name="ic_test_badge_no_background" />

  <java-symbol type="drawable" name="ic_test_icon_badge_experiment" />

packages/EasterEgg/res/values/q_puzzles.xml

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ 
        <item>com.android.systemui:drawable/ic_volume_ringer_vibrate</item>

        <item>com.android.systemui:drawable/ic_volume_voice</item>

        <item>com.android.systemui:drawable/stat_sys_camera</item>

        <item>com.android.systemui:drawable/stat_sys_managed_profile_status</item>

        <item>android:drawable/stat_sys_managed_profile_status</item>

        <item>com.android.systemui:drawable/stat_sys_mic_none</item>

        <item>com.android.systemui:drawable/stat_sys_vpn_ic</item>