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

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

Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE] 

Store a list of drawer layouts with tools:openDrawer encountered and
call openDrawer on them during the post-inflation processing.

Change-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5
(cherry picked from commit ccbc1177)
parent a14ec6f4

tools/layoutlib/bridge/src/android/view/BridgeInflater.java

+36 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.layoutlib.bridge.Bridge; 
import com.android.layoutlib.bridge.BridgeConstants;

import com.android.layoutlib.bridge.BridgeConstants;

import com.android.layoutlib.bridge.android.BridgeContext;

import com.android.layoutlib.bridge.android.BridgeContext;

import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;

import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;

import com.android.layoutlib.bridge.android.support.DrawerLayoutUtil;

import com.android.layoutlib.bridge.android.support.RecyclerViewUtil;

import com.android.layoutlib.bridge.android.support.RecyclerViewUtil;

import com.android.layoutlib.bridge.impl.ParserFactory;

import com.android.layoutlib.bridge.impl.ParserFactory;

import com.android.layoutlib.bridge.util.ReflectionUtils;

import com.android.layoutlib.bridge.util.ReflectionUtils;
@@ -33,10 +34,13 @@ import com.android.util.Pair; 




import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParser;





import android.annotation.NonNull;

import android.content.Context;

import android.content.Context;

import android.util.AttributeSet;

import android.util.AttributeSet;





import java.io.File;

import java.io.File;

import java.util.HashMap;

import java.util.Map;





import static com.android.layoutlib.bridge.android.BridgeContext.getBaseContext;

import static com.android.layoutlib.bridge.android.BridgeContext.getBaseContext;
@@ -48,6 +52,7 @@ public final class BridgeInflater extends LayoutInflater { 
    private final LayoutlibCallback mLayoutlibCallback;

    private final LayoutlibCallback mLayoutlibCallback;

    private boolean mIsInMerge = false;

    private boolean mIsInMerge = false;

    private ResourceReference mResourceReference;

    private ResourceReference mResourceReference;

    private Map<View, String> mOpenDrawerLayouts;





    /**

    /**

     * List of class prefixes which are tried first by default.

     * List of class prefixes which are tried first by default.
@@ -256,7 +261,14 @@ public final class BridgeInflater extends LayoutInflater { 
                    resourceId = 0;

                    resourceId = 0;

                }

                }

                RecyclerViewUtil.setAdapter(view, bc, mLayoutlibCallback, resourceId);

                RecyclerViewUtil.setAdapter(view, bc, mLayoutlibCallback, resourceId);

            } else if (ReflectionUtils.isInstanceOf(view, DrawerLayoutUtil.CN_DRAWER_LAYOUT)) {

                String attrVal = attrs.getAttributeValue(BridgeConstants.NS_TOOLS_URI,

                        BridgeConstants.ATTR_OPEN_DRAWER);

                if (attrVal != null) {

                    getDrawerLayoutMap().put(view, attrVal);

                }

            }

            }



        }

        }

    }

    }
@@ -312,4 +324,28 @@ public final class BridgeInflater extends LayoutInflater { 




        return viewKey;

        return viewKey;

    }

    }



    public void postInflateProcess(View view) {

        if (mOpenDrawerLayouts != null) {

            String gravity = mOpenDrawerLayouts.get(view);

            if (gravity != null) {

                DrawerLayoutUtil.openDrawer(view, gravity);

            }

            mOpenDrawerLayouts.remove(view);

        }

    }



    @NonNull

    private Map<View, String> getDrawerLayoutMap() {

        if (mOpenDrawerLayouts == null) {

            mOpenDrawerLayouts = new HashMap<View, String>(4);

        }

        return mOpenDrawerLayouts;

    }



    public void onDoneInflation() {

        if (mOpenDrawerLayouts != null) {

            mOpenDrawerLayouts.clear();

        }

    }

}
 
}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,4 +54,5 @@ public class BridgeConstants { 
    /** Attribute in the tools namespace used to specify layout manager for RecyclerView. */

    /** Attribute in the tools namespace used to specify layout manager for RecyclerView. */

    @SuppressWarnings("SpellCheckingInspection")

    @SuppressWarnings("SpellCheckingInspection")

    public static final String ATTR_LIST_ITEM = "listitem";

    public static final String ATTR_LIST_ITEM = "listitem";

    public static final String ATTR_OPEN_DRAWER = "openDrawer";

}
 
}

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/DrawerLayoutUtil.java

0 → 100644
+63 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.layoutlib.bridge.android.support;



import com.android.ide.common.rendering.api.LayoutLog;

import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.util.ReflectionUtils.ReflectionException;



import android.annotation.Nullable;

import android.view.View;



import static android.view.Gravity.END;

import static android.view.Gravity.LEFT;

import static android.view.Gravity.RIGHT;

import static android.view.Gravity.START;

import static com.android.layoutlib.bridge.util.ReflectionUtils.getCause;

import static com.android.layoutlib.bridge.util.ReflectionUtils.getMethod;

import static com.android.layoutlib.bridge.util.ReflectionUtils.invoke;



public class DrawerLayoutUtil {



    public static final String CN_DRAWER_LAYOUT = "android.support.v4.widget.DrawerLayout";



    public static void openDrawer(View drawerLayout, @Nullable String drawerGravity) {

        int gravity = -1;

        if ("left".equals(drawerGravity)) {

            gravity = LEFT;

        } else if ("right".equals(drawerGravity)) {

            gravity = RIGHT;

        } else if ("start".equals(drawerGravity)) {

            gravity = START;

        } else if ("end".equals(drawerGravity)) {

            gravity = END;

        }

        if (gravity > 0) {

            openDrawer(drawerLayout, gravity);

        }

    }



    private static void openDrawer(View drawerLayout, int gravity) {

        try {

            invoke(getMethod(drawerLayout.getClass(), "openDrawer", int.class), drawerLayout,

                    gravity);

        } catch (ReflectionException e) {

            Bridge.getLog().error(LayoutLog.TAG_BROKEN, "Unable to open navigation drawer",

                    getCause(e), null);

        }

    }

}

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.ide.common.rendering.api.LayoutlibCallback; 
import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.android.BridgeContext;

import com.android.layoutlib.bridge.android.BridgeContext;

import com.android.layoutlib.bridge.android.RenderParamsFlags;

import com.android.layoutlib.bridge.android.RenderParamsFlags;

import com.android.layoutlib.bridge.util.ReflectionUtils;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;
@@ -30,6 +31,7 @@ import android.view.View; 
import java.lang.reflect.Method;

import java.lang.reflect.Method;





import static com.android.layoutlib.bridge.util.ReflectionUtils.ReflectionException;

import static com.android.layoutlib.bridge.util.ReflectionUtils.ReflectionException;

import static com.android.layoutlib.bridge.util.ReflectionUtils.getCause;

import static com.android.layoutlib.bridge.util.ReflectionUtils.getMethod;

import static com.android.layoutlib.bridge.util.ReflectionUtils.getMethod;

import static com.android.layoutlib.bridge.util.ReflectionUtils.invoke;

import static com.android.layoutlib.bridge.util.ReflectionUtils.invoke;
@@ -70,11 +72,6 @@ public class RecyclerViewUtil { 
        }

        }

    }

    }





    private static Throwable getCause(Throwable throwable) {

        Throwable cause = throwable.getCause();

        return cause == null ? throwable : cause;

    }



    private static void setLayoutManager(@NonNull View recyclerView, @NonNull BridgeContext context,

    private static void setLayoutManager(@NonNull View recyclerView, @NonNull BridgeContext context,

            @NonNull LayoutlibCallback callback) throws ReflectionException {

            @NonNull LayoutlibCallback callback) throws ReflectionException {

        if (getLayoutManager(recyclerView) == null) {

        if (getLayoutManager(recyclerView) == null) {

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 




            // post-inflate process. For now this supports TabHost/TabWidget

            // post-inflate process. For now this supports TabHost/TabWidget

            postInflateProcess(view, params.getLayoutlibCallback(), isPreference ? view : null);

            postInflateProcess(view, params.getLayoutlibCallback(), isPreference ? view : null);

            mInflater.onDoneInflation();





            setActiveToolbar(view, context, params);

            setActiveToolbar(view, context, params);
@@ -1352,6 +1353,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 
                }

                }

            }

            }

        } else if (view instanceof ViewGroup) {

        } else if (view instanceof ViewGroup) {

            mInflater.postInflateProcess(view);

            ViewGroup group = (ViewGroup) view;

            ViewGroup group = (ViewGroup) view;

            final int count = group.getChildCount();

            final int count = group.getChildCount();

            for (int c = 0; c < count; c++) {

            for (int c = 0; c < count; c++) {