Timob 11601 3 0 x: Android: Expose ActionBar methods #3419
Merged
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
Exposed ability to set the icon on the action bar.
…-3_0_X Conflicts: android/titanium/src/java/org/appcelerator/titanium/proxy/ActivityProxy.java
|
Since Bill already did FR against all the sub-tasks of TIMOB-11601, I only tested against two sub-tasks (TIMOB-11642 and TIMOB-11643) and TIMOB-11602 which caused the merge conflict on both v8 and rhino. All passed. Accepted |
pingwang2011
added a commit
that referenced
this pull request
Nov 13, 2012
Timob 11601 3 0 x: Android: Expose ActionBar methods
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.
http://jira.appcelerator.org/browse/TIMOB-11601
Test case in Jira.
NOTE This is allen's branch with 3_0_X merged into it since allen's PR #3416 was not mergeable and we're in a bit of a hurry.
All of the test cases have been tested successfully with this branch.