Merge "Fix the status icon colors in QS" into oc-dev

2017-05-13 13:10:52 +00:00
parent 8902bbe4e3 9a376bcd45
commit d472349229
9 changed files with 77 additions and 65 deletions
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -639,6 +639,11 @@ public abstract class LayoutInflater {
                }
            }

+            Object lastContext = mConstructorArgs[0];
+            if (mConstructorArgs[0] == null) {
+                // Fill in the context if not already within inflation.
+                mConstructorArgs[0] = mContext;
+            }
            Object[] args = mConstructorArgs;
            args[1] = attrs;

@@ -648,6 +653,7 @@ public abstract class LayoutInflater {
                final ViewStub viewStub = (ViewStub) view;
                viewStub.setLayoutInflater(cloneInContext((Context) args[0]));
            }
+            mConstructorArgs[0] = lastContext;
            return view;

        } catch (NoSuchMethodException e) {