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

Commit e64a5bd2 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix DatePicker rendering. 

1. Return AccessibilityManager service from context.
2. Don't throw an exception if no style specifited in
obtainStyledAttributes. Specifying no style is valid and it's supposed
to use the default theme in that case.

Bug: http://b.android.com/82712 and http://b.android.com/79218
Change-Id: Iba7097f36996e4d6f1e9db778dc73294f2854c79
parent 0ff4568c

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

+18 −10
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import android.view.DisplayAdjustments; 
import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.view.textservice.TextServicesManager;



import java.io.File;
@@ -476,6 +477,10 @@ public final class BridgeContext extends Context { 
            return mDisplayManager;

        }



        if (ACCESSIBILITY_SERVICE.equals(service)) {

            return AccessibilityManager.getInstance(this);

        }



        throw new UnsupportedOperationException("Unsupported Service: " + service);

    }
@@ -491,8 +496,10 @@ public final class BridgeContext extends Context { 
    @Override

    public final BridgeTypedArray obtainStyledAttributes(int resid, int[] attrs)

            throws Resources.NotFoundException {

        StyleResourceValue style = null;

        // get the StyleResourceValue based on the resId;

        StyleResourceValue style = getStyleByDynamicId(resid);

        if (resid != 0) {

            style = getStyleByDynamicId(resid);



            if (style == null) {

                // In some cases, style may not be a dynamic id, so we do a full search.
@@ -505,6 +512,7 @@ public final class BridgeContext extends Context { 
            if (style == null) {

                throw new Resources.NotFoundException();

            }

        }



        if (mTypedArrayCache == null) {

            mTypedArrayCache = new HashMap<int[], Map<Integer,BridgeTypedArray>>();