chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java - Issue 1989203003: Update checks for N+

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

Issue 1989203003: Update checks for N+ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

index e3b2bec5be67723337dde337a75391c7fc8a3baf..5887eba84ce825c158613288b10d58f446e3e59d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

@@ -75,11 +75,11 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl

protected void attachBaseContext(Context newBase) {

super.attachBaseContext(newBase);

- // On N, Chrome should always retain the tab strip layout on tablets. Normally in

+ // On N+, Chrome should always retain the tab strip layout on tablets. Normally in

// multi-window, if Chrome is launched into a smaller screen Android will load the tab

// switcher resources. Overriding the smallestScreenWidthDp in the Configuration ensures

// Android will load the tab strip resources. See crbug.com/588838.

- if (Build.VERSION.CODENAME.equals("N")) {

+ if (Build.VERSION.CODENAME.equals("N") || Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {

int smallestDeviceWidthDp = DeviceFormFactor.getSmallestDeviceWidthDp(this);

if (smallestDeviceWidthDp >= DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP) {