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-7401 Android: Implement switchCamera #4566

Merged
merged 8 commits into from
Aug 20, 2013
Merged

TIMOB-7401 Android: Implement switchCamera #4566

merged 8 commits into from
Aug 20, 2013

Commits on Jul 18, 2013

  1. Merge branch 'timob-12970' into timob-7401

    @billdawson
    billdawson committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    f266d31 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2013

  1. Support Ti.Media.switchCamera. TIMOB-7401

    @billdawson
    billdawson committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    f5e96cf View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2013

  1. Merge remote-tracking branch 'origin/master' into timob-7401 

    Conflicts:
	android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java
	android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
    @billdawson
    billdawson committed Aug 8, 2013
    Configuration menu
    Copy the full SHA
    226e61e View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2013

  1. Document Ti.Media.switchCamera 

    TIMOB-7401
    @billdawson
    billdawson committed Aug 9, 2013
    Configuration menu
    Copy the full SHA
    2bcc971 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into timob-7401

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

Commits on Aug 13, 2013

  1. Add Android-specific note to switchCamera doc. 

    TIMOB-7401
    @billdawson
    billdawson committed Aug 13, 2013
    Configuration menu
    Copy the full SHA
    fb3d0b9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into timob-7401

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

Commits on Aug 20, 2013

  1. Remove unused function. 

    TIMOB-7401
    @billdawson
    billdawson committed Aug 20, 2013
    Configuration menu
    Copy the full SHA
    c27d353 View commit details
    Browse the repository at this point in the history