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.

Sign up for GitHub

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

Jump to bottom

TIMOB-12970 Android: Support and document the availableCameras property in Ti.Media. #4450

Merged
merged 5 commits into from
Aug 6, 2013
Merged

TIMOB-12970 Android: Support and document the availableCameras property in Ti.Media. #4450

merged 5 commits into from
Aug 6, 2013

Commits on Jul 12, 2013

  1. Support and document the availableCameras property in Ti.Media. 

    TIMOB-12970
    @billdawson
    billdawson committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    ef4823e View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2013

  1. Merge remote-tracking branch 'upstream/master' into timob-12970 

    Conflicts:
	android/runtime/v8/AndroidManifest.xml
    @billdawson
    billdawson committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    629299c View commit details
    Browse the repository at this point in the history

  2. Remove unneeded "since" yaml keys for ipad/iphone 

    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
    billdawson committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    57097f3 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2013

  1. Merge remote-tracking branch 'upstream/master' into timob-12970

    @billdawson
    billdawson committed Aug 5, 2013
    Configuration menu
    Copy the full SHA
    9ad9b59 View commit details
    Browse the repository at this point in the history

  2. Remove ipad/iphone from "since" for 

    availableCameras

TIMOB-12970
    @billdawson
    billdawson committed Aug 5, 2013
    Configuration menu
    Copy the full SHA
    78c48a7 View commit details
    Browse the repository at this point in the history