Skip to content

Commit df686d2

Browse files
authored
Revert "Reland Display Features support (Foldable and Cutout) (flutter#29447)" (flutter#29574)
This reverts commit 3364409.
1 parent b3cbee5 commit df686d2

File tree

29 files changed

+88
-890
lines changed

29 files changed

+88
-890
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ deps = {
570570
'packages': [
571571
{
572572
'package': 'flutter/android/embedding_bundle',
573-
'version': 'last_updated:2021-11-03T10:29:50-0700'
573+
'version': 'last_updated:2021-10-28T23:34:47-0700'
574574
}
575575
],
576576
'condition': 'download_android_deps',

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/Rende
832832
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreen.java
833833
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java
834834
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java
835-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java
836835
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
837836
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java
838837
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java

lib/ui/fixtures/ui_test.dart

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void hooksTests() {
339339
window.onMetricsChanged!();
340340
_callHook(
341341
'_updateWindowMetrics',
342-
20,
342+
17,
343343
0, // window Id
344344
0.1234, // device pixel ratio
345345
0.0, // width
@@ -355,11 +355,8 @@ void hooksTests() {
355355
0.0, // system gesture inset top
356356
0.0, // system gesture inset right
357357
0.0, // system gesture inset bottom
358-
0.0, // system gesture inset left
358+
0.0, // system gesture inset left,
359359
22.0, // physicalTouchSlop
360-
<double>[], // display features bounds
361-
<int>[], // display features types
362-
<int>[], // display features states
363360
);
364361

365362
expectIdentical(originalZone, callbackZone);
@@ -406,7 +403,7 @@ void hooksTests() {
406403
test('Window padding/insets/viewPadding/systemGestureInsets', () {
407404
_callHook(
408405
'_updateWindowMetrics',
409-
20,
406+
17,
410407
0, // window Id
411408
1.0, // devicePixelRatio
412409
800.0, // width
@@ -424,9 +421,6 @@ void hooksTests() {
424421
0.0, // systemGestureInsetBottom
425422
0.0, // systemGestureInsetLeft
426423
22.0, // physicalTouchSlop
427-
<double>[], // display features bounds
428-
<int>[], // display features types
429-
<int>[], // display features states
430424
);
431425

432426
expectEquals(window.viewInsets.bottom, 0.0);
@@ -436,7 +430,7 @@ void hooksTests() {
436430

437431
_callHook(
438432
'_updateWindowMetrics',
439-
20,
433+
17,
440434
0, // window Id
441435
1.0, // devicePixelRatio
442436
800.0, // width
@@ -454,9 +448,6 @@ void hooksTests() {
454448
44.0, // systemGestureInsetBottom
455449
0.0, // systemGestureInsetLeft
456450
22.0, // physicalTouchSlop
457-
<double>[], // display features bounds
458-
<int>[], // display features types
459-
<int>[], // display features states
460451
);
461452

462453
expectEquals(window.viewInsets.bottom, 400.0);
@@ -468,7 +459,7 @@ void hooksTests() {
468459
test('Window physical touch slop', () {
469460
_callHook(
470461
'_updateWindowMetrics',
471-
20,
462+
17,
472463
0, // window Id
473464
1.0, // devicePixelRatio
474465
800.0, // width
@@ -486,17 +477,14 @@ void hooksTests() {
486477
0.0, // systemGestureInsetBottom
487478
0.0, // systemGestureInsetLeft
488479
11.0, // physicalTouchSlop
489-
<double>[], // display features bounds
490-
<int>[], // display features types
491-
<int>[], // display features states
492480
);
493481

494482
expectEquals(window.viewConfiguration.gestureSettings,
495483
GestureSettings(physicalTouchSlop: 11.0));
496484

497485
_callHook(
498486
'_updateWindowMetrics',
499-
20,
487+
17,
500488
0, // window Id
501489
1.0, // devicePixelRatio
502490
800.0, // width
@@ -514,17 +502,14 @@ void hooksTests() {
514502
44.0, // systemGestureInsetBottom
515503
0.0, // systemGestureInsetLeft
516504
-1.0, // physicalTouchSlop
517-
<double>[], // display features bounds
518-
<int>[], // display features types
519-
<int>[], // display features states
520505
);
521506

522507
expectEquals(window.viewConfiguration.gestureSettings,
523508
GestureSettings(physicalTouchSlop: null));
524509

525510
_callHook(
526511
'_updateWindowMetrics',
527-
20,
512+
17,
528513
0, // window Id
529514
1.0, // devicePixelRatio
530515
800.0, // width
@@ -542,9 +527,6 @@ void hooksTests() {
542527
44.0, // systemGestureInsetBottom
543528
0.0, // systemGestureInsetLeft
544529
22.0, // physicalTouchSlop
545-
<double>[], // display features bounds
546-
<int>[], // display features types
547-
<int>[], // display features states
548530
);
549531

550532
expectEquals(window.viewConfiguration.gestureSettings,
@@ -770,7 +752,4 @@ void _callHook(
770752
Object? arg15,
771753
Object? arg16,
772754
Object? arg17,
773-
Object? arg18,
774-
Object? arg19,
775-
Object? arg20,
776755
]) native 'CallHook';

lib/ui/hooks.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ void _updateWindowMetrics(
2626
double systemGestureInsetBottom,
2727
double systemGestureInsetLeft,
2828
double physicalTouchSlop,
29-
List<double> displayFeaturesBounds,
30-
List<int> displayFeaturesType,
31-
List<int> displayFeaturesState,
3229
) {
3330
PlatformDispatcher.instance._updateWindowMetrics(
3431
id,
@@ -48,9 +45,6 @@ void _updateWindowMetrics(
4845
systemGestureInsetBottom,
4946
systemGestureInsetLeft,
5047
physicalTouchSlop,
51-
displayFeaturesBounds,
52-
displayFeaturesType,
53-
displayFeaturesState,
5448
);
5549
}
5650

0 commit comments

Comments
 (0)