fix(android)(8_0_X): Improved merge of "tiapp.xml" android manifest settings #10900
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…anifest settings into Titanium's default manifest settings - [TIMOB-26778] Fixed bug where overriding an <activity/> in "tiapp.xml" caused most "configChanges" values to be lost. * Would cause activity window's UI to disappear if a system config change occurred dynamically. - [TIMOB-26777] Fixed bug where connecting/disconnecting a physical keyboard to/from device caused UI to disappear. - [TIMOB-27067] Fixed bug where UI sometimes disappears on Android 9.0 or higher when batter saver turns on/off. - Added missing <activity/> "configChanges" values: * keyboard, layoutDirection, mcc, mnc, navigation, touchscreen, uiMode - Removed launchMode "singleTask" from "TiMapActivity" and "TiVideoActivity". (Not applicable to child activities.)
…EJS "AndroidManifest.xml" template for [TIMOB-26778] - Fixed previous [TIMOB-26778] commit to not inject configChanges values to all activities such as those belonging to modules/AARs. * Should only be added to Titanium activities that need it. They're now injected via "allActivityConfigChanges" EJS template variable. - Removed last remnants of "Ti.Map" from build scripts. - Removed "TiVideoActivity" and "TiCameraActivity" injection code from build script. * There is no downside to always having these activities in the "AndroidManifest.xml". So, it's been simplified.
…erride "AndroidManifest.xml" settings defined in AAR or "timodule.xml" - Change manifest merge order. Now merges AAR and "timodule.xml" settings first. "tiapp.xml" settings are merged last.
|
|
FR Passed. Tested with the test cases mentioned in TIMOB-26778,TIMOB-26777, TIMOB-27067 and TIMOB-27067 Test Environment: |
|
Jenkin is failing. Not able to merge. waiting for resolving jenkin failure to merge |
|
PR Merged |
sgtcoolguy
pushed a commit
to sgtcoolguy/titanium_mobile
that referenced
this pull request
May 23, 2019
…ettings (tidev#10900) * [TIMOB-26778] Android: Improved merge of "tiapp.xml" file's android manifest settings into Titanium's default manifest settings - [TIMOB-26778] Fixed bug where overriding an <activity/> in "tiapp.xml" caused most "configChanges" values to be lost. * Would cause activity window's UI to disappear if a system config change occurred dynamically. - [TIMOB-26777] Fixed bug where connecting/disconnecting a physical keyboard to/from device caused UI to disappear. - [TIMOB-27067] Fixed bug where UI sometimes disappears on Android 9.0 or higher when batter saver turns on/off. - Added missing <activity/> "configChanges" values: * keyboard, layoutDirection, mcc, mnc, navigation, touchscreen, uiMode - Removed launchMode "singleTask" from "TiMapActivity" and "TiVideoActivity". (Not applicable to child activities.) * Android: Added new "allActivityConfigChanges" variable to be used by EJS "AndroidManifest.xml" template for [TIMOB-26778] - Fixed previous [TIMOB-26778] commit to not inject configChanges values to all activities such as those belonging to modules/AARs. * Should only be added to Titanium activities that need it. They're now injected via "allActivityConfigChanges" EJS template variable. - Removed last remnants of "Ti.Map" from build scripts. - Removed "TiVideoActivity" and "TiCameraActivity" injection code from build script. * There is no downside to always having these activities in the "AndroidManifest.xml". So, it's been simplified. * [TIMOB-27084] Android: Fixed issue where "tiapp.xml" was unable to override "AndroidManifest.xml" settings defined in AAR or "timodule.xml" - Change manifest merge order. Now merges AAR and "timodule.xml" settings first. "tiapp.xml" settings are merged last.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA:
Cherry-pick of: PR #10884