Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/core/src/lib/TwaManifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ const SHORT_NAME_MAX_SIZE = 12;
const MIN_NOTIFICATION_ICON_SIZE = 48;

// Supported display modes for TWA
const DISPLAY_MODE_VALUES = ['standalone', 'minimal-ui', 'fullscreen', 'fullscreen-sticky'];
const DISPLAY_MODE_VALUES = ['standalone', 'minimal-ui', 'fullscreen', 'fullscreen-sticky',
'browser'];
export type DisplayMode = typeof DISPLAY_MODE_VALUES[number];
export const DisplayModes: DisplayMode[] = [...DISPLAY_MODE_VALUES];

Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/lib/features/FeatureManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {ProtocolHandlersFeature} from './ProtocolHandlersFeature';
import {FileHandlingFeature} from './FileHandlingFeature';

const ANDROID_BROWSER_HELPER_VERSIONS = {
stable: 'com.google.androidbrowserhelper:androidbrowserhelper:2.6.0',
alpha: 'com.google.androidbrowserhelper:androidbrowserhelper:2.6.0',
stable: 'com.google.androidbrowserhelper:androidbrowserhelper:2.6.1',
alpha: 'com.google.androidbrowserhelper:androidbrowserhelper:2.6.1',
};

/**
Expand Down
8 changes: 1 addition & 7 deletions packages/core/src/spec/lib/TwaManifestSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,6 @@ describe('TwaManifest', () => {
expect(twaManifest.maskableIconUrl).toBe('https://pwa-directory.com/favicons/maskable.png');
expect(twaManifest.monochromeIconUrl).toBe('https://pwa-directory.com/favicons/monochrome.png');
});

it('Replaces unsupported display modes with `standalone`', () => {
const manifestUrl = new URL('https://pwa-directory.com/manifest.json');
expect(TwaManifest.fromWebManifestJson(manifestUrl, {display: 'browser'}).display)
.toBe('standalone');
});
});

describe('#constructor', () => {
Expand Down Expand Up @@ -345,10 +339,10 @@ describe('TwaManifest', () => {
expect(asDisplayMode('standalone')).toBe('standalone');
expect(asDisplayMode('fullscreen')).toBe('fullscreen');
expect(asDisplayMode('minimal-ui')).toBe('minimal-ui');
expect(asDisplayMode('browser')).toBe('browser');
});

it('Returns null for unsupported display modes', () => {
expect(asDisplayMode('browser')).toBeNull();
expect(asDisplayMode('bogus')).toBeNull();
expect(asDisplayMode('')).toBeNull();
});
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/spec/lib/features/FeatureManagerSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('FeatureManager', () => {
expect(features.applicationClass.onCreate).toEqual([]);
expect(features.applicationClass.variables).toEqual([]);
expect(features.buildGradle.dependencies).toContain(
'com.google.androidbrowserhelper:androidbrowserhelper:2.6.0');
'com.google.androidbrowserhelper:androidbrowserhelper:2.6.1');
expect(features.buildGradle.repositories).toEqual(emptySet);
expect(features.launcherActivity.imports).toEqual(emptySet);
expect(features.launcherActivity.launchUrl).toEqual([]);
Expand All @@ -99,7 +99,7 @@ describe('FeatureManager', () => {
} as TwaManifest;
const features = new FeatureManager(manifest);
expect(features.buildGradle.dependencies).toContain(
'com.google.androidbrowserhelper:androidbrowserhelper:2.6.0');
'com.google.androidbrowserhelper:androidbrowserhelper:2.6.1');
});

it('Adds INTERNET permission when WebView fallback is enabled', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@
<% } else if (display === 'fullscreen-sticky') { %>
<meta-data android:name="android.support.customtabs.trusted.DISPLAY_MODE"
android:value="sticky-immersive" />
<% } else if (display === 'minimal-ui') { %>
<meta-data android:name="android.support.customtabs.trusted.DISPLAY_MODE"
android:value="minimal-ui" />
<% } else if (display === 'browser') { %>
<meta-data android:name="android.support.customtabs.trusted.DISPLAY_MODE"
android:value="browser" />
<% } %>

<meta-data android:name="android.support.customtabs.trusted.SCREEN_ORIENTATION"
Expand Down