Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Undo Deletion in #31092 #31661

Merged
merged 5 commits into from
Feb 28, 2022
Merged

Undo Deletion in #31092 #31661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7447d36
Add back line
camsim99 Feb 24, 2022
b733574
Formatting:
camsim99 Feb 24, 2022
e8397b7
Add test
camsim99 Feb 25, 2022
afe5e3f
Test APIs
camsim99 Feb 25, 2022
e64c720
Fix test
camsim99 Feb 25, 2022
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
4 changes: 4 additions & 0 deletions shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ public void updateSystemUiOverlays() {
}
}
}

if (currentTheme != null) {
setSystemChromeSystemUIOverlayStyle(currentTheme);
Copy link

@blasten blasten Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add a test for this?

Copy link
Contributor Author

@camsim99 camsim99 Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good point

Copy link
Contributor Author

@camsim99 camsim99 Feb 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blasten I added one and I will add some additional tests for the updateSystemUiOverlays method in another PR.

}
}

private void restoreSystemChromeSystemUIOverlays() {
Expand Down
39 changes: 39 additions & 0 deletions shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
Expand Down Expand Up @@ -505,6 +507,43 @@ public void showSystemOverlays() {
verify(fakeWindowInsetsController).show(WindowInsetsCompat.Type.navigationBars());
}

@Config(sdk = 30)
@Test
public void verifyUpdateSystemUiOverlaysAppliesCurrentTheme() {
View fakeDecorView = mock(View.class);
Window fakeWindow = mock(Window.class);
when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
Activity fakeActivity = mock(Activity.class);
when(fakeActivity.getWindow()).thenReturn(fakeWindow);
PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
WindowInsetsController fakeWindowInsetsController = mock(WindowInsetsController.class);
when(fakeWindow.getInsetsController()).thenReturn(fakeWindowInsetsController);

// Style that requires usage of all system bar APIs used in PlatformPlugin to update overlay
// style
SystemChromeStyle testStyle =
new SystemChromeStyle(
0XFF000000, Brightness.LIGHT, true, 0XFFC70039, Brightness.LIGHT, 0XFF006DB3, true);

platformPlugin.updateSystemUiOverlays();

verify(fakeWindow, never()).setStatusBarColor(anyInt());
verify(fakeWindow, never()).setNavigationBarColor(anyInt());
verify(fakeWindow, never()).setNavigationBarDividerColor(anyInt());
verify(fakeWindow, never()).setStatusBarContrastEnforced(anyBoolean());
verify(fakeWindow, never()).setNavigationBarContrastEnforced(anyBoolean());

platformPlugin.mPlatformMessageHandler.setSystemUiOverlayStyle(testStyle);
platformPlugin.updateSystemUiOverlays();

verify(fakeWindow, times(2)).setStatusBarColor(0xFF000000);
verify(fakeWindow, times(2)).setNavigationBarColor(0XFFC70039);
verify(fakeWindow, times(2)).setNavigationBarDividerColor(0XFF006DB3);
verify(fakeWindow, times(2)).setStatusBarContrastEnforced(true);
verify(fakeWindow, times(2)).setNavigationBarContrastEnforced(true);
}

@Config(sdk = 28)
@Test
public void doNotEnableEdgeToEdgeOnOlderSdk() {
Expand Down