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

Upgrade android SDK to API 32 #33524

Merged
fluttergithubbot merged 14 commits into from
Jun 2, 2022
Merged

Upgrade android SDK to API 32 #33524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
61657df
Upgrade android SDK to API 32
GaryQian May 21, 2022
3f69442
Fix script
GaryQian May 21, 2022
ffac7ef
Update packages
GaryQian May 21, 2022
71b0f40
Bump build.gradles
GaryQian May 25, 2022
1d088c9
Fix android lint issues
GaryQian May 31, 2022
426be34
FOrmatting
GaryQian May 31, 2022
020cda4
Temp buildroot roll
GaryQian May 31, 2022
29c00dd
Ignore LambdaLast
GaryQian May 31, 2022
a0b38bd
Revert "Ignore LambdaLast"
GaryQian May 31, 2022
b57e3bb
Ignore lambdalast
GaryQian May 31, 2022
c4834a7
Missed a file
GaryQian May 31, 2022
143e32a
LambdaLast in lint.xml
GaryQian May 31, 2022
1ed6da3
Address comments
GaryQian Jun 2, 2022
33ad721
Roll buildroot
GaryQian Jun 2, 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
Prev Previous commit
Next Next commit
Address comments
  • Loading branch information
@GaryQian
GaryQian committed Jun 2, 2022
commit 1ed6da3992476e5e3e232972414b20b944b30eb7
2 changes: 2 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 @@ -4,6 +4,7 @@

package io.flutter.plugin.platform;

import android.annotation.TargetApi;
import android.app.Activity;
import android.app.ActivityManager.TaskDescription;
import android.content.ClipData;
Expand Down Expand Up @@ -363,6 +364,7 @@ private void restoreSystemChromeSystemUIOverlays() {
}

@SuppressWarnings("deprecation")
@TargetApi(21)
private void setSystemChromeSystemUIOverlayStyle(
PlatformChannel.SystemChromeStyle systemChromeStyle) {
Window window = activity.getWindow();
Expand Down
37 changes: 2 additions & 35 deletions tools/android_lint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,47 +34,14 @@
column="16"/>
</issue>

<issue
id="InlinedApi"
message="Field requires API level 21 (current min is 16): `android.view.WindowManager.LayoutParams#FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS`"
errorLine1=" window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java"
line="377"
column="23"/>
</issue>

<issue
id="InlinedApi"
message="Field requires API level 19 (current min is 16): `android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_STATUS`"
errorLine1=" WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java"
line="383"
column="11"/>
</issue>

<issue
id="InlinedApi"
message="Field requires API level 19 (current min is 16): `android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_NAVIGATION`"
errorLine1=" | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java"
line="384"
column="17"/>
</issue>

<issue
id="InlinedApi"
message="Field requires API level 17 (current min is 16): `android.view.View#LAYOUT_DIRECTION_LTR`"
errorLine1=" return direction == View.LAYOUT_DIRECTION_LTR || direction == View.LAYOUT_DIRECTION_RTL;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
line="653"
line="661"
column="25"/>
</issue>

Expand All @@ -85,7 +52,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
line="653"
line="661"
column="67"/>
</issue>

Expand Down
4 changes: 4 additions & 0 deletions tools/android_lint/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<sdk dir="../../../third_party/android_tools/sdk" />
<module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-S">
<manifest file="../../../flutter/shell/platform/android/AndroidManifest.xml" />
<src file="../../../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
<src file="../../../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
<src file="../../../flutter/shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java" />
<src file="../../../flutter/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java" />
Expand All @@ -22,6 +23,7 @@
<src file="../../../flutter/shell/platform/android/io/flutter/util/Predicate.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/util/TraceSection.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java" />
Expand All @@ -33,6 +35,7 @@
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java" />
Expand All @@ -44,6 +47,7 @@
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreen.java" />
<src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java" />
Expand Down