Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-24579] Android: recognise newer attributes as valid tokens #8961

Merged
merged 7 commits into from Jul 20, 2017

Conversation

frankieandone
Copy link
Contributor

@frankieandone frankieandone commented Apr 13, 2017

JIRA: https://jira.appcelerator.org/browse/TIMOB-24579

Test case:

  1. Add attribute
  2. Run app
  3. Check if attribute is in build/android/AndroidManifest.xml. If it is present then test has passed.

Copy link
Contributor

@jquick-axway jquick-axway left a comment

Choose a reason for hiding this comment

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

Approved.

Note: I also verified the spelling of all attributes defined for and .

@ssjsamir
Copy link
Contributor

@fmerzadyan Could you take a look at the merge conflicts?

@lokeshchdhry
Copy link
Contributor

FR Passed.

Adding newer tokens to the tiapp.xml adds them succcessfully to the android manifest.
Added few attributes:

<android xmlns:android="http://schemas.android.com/apk/res/android">
        <manifest>
            <application android:isGame = "true">
                <activity android:configChanges="keyboardHidden"
                    android:label="@string/app_name"
                    android:name=".Timob24971Activity" 
                    android:screenOrientation="portrait"
                	android:supportsPictureInPicture="true"/>
            </application>
        </manifest>
    </android>

Studio Ver: 4.9.1.201707130742
SDK Ver: 6.2.0.v20170717103243 from PR
OS Ver: 10.12.3
Xcode Ver: Xcode 8.3.3
Appc NPM: 4.2.9
Appc CLI: 6.2.2
Ti CLI Ver: 5.0.14
Alloy Ver: 1.9.11
Node Ver: 6.10.1
Java Ver: 1.8.0_101
Devices: Android 6.0.1, Android 7.0

@lokeshchdhry
Copy link
Contributor

@fmerzadyan , Can you please resolve the conflicts so that I can merge. Thanks.

@lokeshchdhry lokeshchdhry merged commit 12ddf5e into tidev:master Jul 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants