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

Android change to match the Google internal changes. #17331

Merged
renyou merged 4 commits into from
Mar 26, 2020
Merged

Android change to match the Google internal changes. #17331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff0c431
Android change to match the google internal changes.
renyou Mar 25, 2020
4369e21
Fix format.
renyou Mar 26, 2020
72214d1
Revert format change, add super call.
renyou Mar 26, 2020
416a44d
Remove comment for API version.
renyou Mar 26, 2020
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
1 change: 1 addition & 0 deletions shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ protected void onPostResume() {
// @Override - added in API level 23

@mehmetf mehmetf Mar 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I believe we can also remove this comment because this is now using androidx support library so it should not matter when the API was added.

@renyou renyou Mar 26, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done.

public void onRequestPermissionsResult(
int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
eventDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
}

Expand Down
3 changes: 2 additions & 1 deletion shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ private void switchLaunchThemeForNormalTheme() {
} catch (PackageManager.NameNotFoundException exception) {
Log.e(
TAG,
"Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal theme.");
"Could not read meta-data for FlutterFragmentActivity. Using the launch theme as normal"

@mehmetf mehmetf Mar 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You can revert this. Totally unnecessary; the internal tooling for some reason made this change. It should be reverted in google3 as well (which will happen automatically with the roll).

@renyou renyou Mar 26, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done.

+ " theme.");
}
}

@mehmetf mehmetf Mar 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There must be a similar change here as well for calling super. Check around line 490.

@renyou renyou Mar 26, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done. Sorry somehow I missed this.


Expand Down