Commit a6c0db86 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

[WebLayer] Limit site settings dialog fix to <N

This CL limits the changes from crrev.com/c/2402188 to apply only to
Android <N. I originally hooked up the fix to all Android versions, even
though it wasn't needed past N, to increase the chances of us catching
a regression with that code given that most of our testing/usage
happens on newer versions. Limiting it to only the versions that need
it will help with performance on >=N, and once we have manual testers
covering the site settings ui, regressions should get caught through
that.

Bug: 1126647
Change-Id: I96919bd0faf6220029e0397a23593e3ff5c8bbed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2406694Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806333}
parent 407e6843
......@@ -7,6 +7,7 @@ package org.chromium.weblayer_private;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.util.AttributeSet;
......@@ -93,7 +94,9 @@ public class SiteSettingsFragmentImpl extends RemoteFragmentImpl {
attachBaseContext(mFragmentImpl.getWebLayerContext());
// Register ourselves as a the LayoutInflater factory so we can handle loading Views.
// See onCreateView for information about why this is needed.
getLayoutInflater().setFactory2(this);
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
getLayoutInflater().setFactory2(this);
}
// This class doesn't extend AppCompatActivity, so some appcompat functionality doesn't
// get initialized, which leads to some appcompat widgets (like switches) rendering
// incorrectly. There are some resource issues with having this class extend
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment