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

Commit defa2a56 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Moved .internal.view.menu.Utils to .internal.util.ThemeUtilities. 

Change-Id: I457c984cbc94d62c4a75a25d5ad0e7db11d5fa9c
parent 38b014ec

core/java/com/android/internal/view/menu/Utils.java→core/java/com/android/internal/util/ThemeUtilities.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.view.menu;

package com.android.internal.util;



import android.content.Context;

import android.text.TextUtils;
@@ -25,7 +25,7 @@ import android.view.View; 
 * Modifications made to improve performance by assuming that the theme-specific

 * APIs are present (and therefore reflection is not necessary).

 */

public class Utils {

public class ThemeUtilities {

    /**

     * Alternative to {@link #resolveDefaultStyleAttr(Context, String)} which

     * allows you to specify a resource id for fallback. This is merely an

core/java/com/android/internal/view/menu/MenuBuilder.java

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
package com.android.internal.view.menu;





import com.android.internal.util.ThemeUtilities;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -243,7 +245,7 @@ public class MenuBuilder implements Menu { 
         */

        int resolveDefaultTheme(Context context, String themeAttrName, int fallbackStyleId) {

            if (themeAttrName != null) {

                int attrId = Utils.resolveDefaultStyleAttr(context, themeAttrName, 0);

                int attrId = ThemeUtilities.resolveDefaultStyleAttr(context, themeAttrName, 0);

                if (attrId != 0) {

                    TypedArray a = context.obtainStyledAttributes(new int[] { attrId });

                    try {