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-12970 Android: Support and document the availableCameras property in Ti.Media. #4450

Merged
merged 5 commits into from Aug 6, 2013
Merged

Conversation

billdawson
Copy link
Contributor

See JIRA for testing notes.

There is a doc change in here, so don't forget to test that too.

@ghost ghost assigned pingwang2011 Jul 29, 2013

<uses-sdk android:minSdkVersion="8" />
<uses-sdk android:minSdkVersion="9" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Why it's "9" here instead of "10"?

@pingwang2011
Copy link
Contributor

Ran the test case on HTC sensation 4G (2.3.6), Galaxy Nexus (4.0.4), Galaxy Tab (3.2), Nexus 7 (4.1) and all passed. FR passed . Left a few minor comments.
Please also merge this PR with master.

Conflicts:
	android/runtime/v8/AndroidManifest.xml
The "since" key for ipad/iphone in Media.yml availableCameras, CAMERA_FRONT
and CAMERA_REAR entries were not needed because they've been there
for some time though undocumented.
TIMOB-12970
@billdawson
Copy link
Contributor Author

@pingwang2011 Thank you, I made the doc changes (getting rid of "since" entries for ipad/iphone) and merged master. The merge from master actually set that api level to 10 appropriately.

type: Array<Number>
platforms: [iphone, ipad, android]
since:
iphone: "3.2.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to remove iphone and ipad here too.

@billdawson
Copy link
Contributor Author

@pingwang2011 Okay, that's in there too now.

@pingwang2011
Copy link
Contributor

Code and doc reviewed. Ran docgen.py. All passed. Accepted

pingwang2011 added a commit that referenced this pull request Aug 6, 2013
TIMOB-12970 Android: Support and document the availableCameras property in Ti.Media.
@pingwang2011 pingwang2011 merged commit 6350601 into tidev:master Aug 6, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants