Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Ability to set a zoom factor from xml or programmatically #104

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Ability to set a zoom factor from xml or programmatically #104

wants to merge 9 commits into from

Commits on Feb 9, 2017

  1. added zoom functionality

    @chrbien
    chrbien committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    6234329 View commit details
    Browse the repository at this point in the history

  2. added test

    @chrbien
    chrbien committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    ce35c36 View commit details
    Browse the repository at this point in the history

  3. added security exception for lint error

    @chrbien
    chrbien committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    bf5ee43 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. camera now shows the picture after takePicture is called, call of res… 

    …umePreview resumes the normal preview mode
    @chrbien
    chrbien committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    8eb02db View commit details
    Browse the repository at this point in the history

  2. fixed demo to show same behaviour as before

    @chrbien
    chrbien committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    073f6d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Merge branch 'master' of https://github.com/google/cameraview 

    # Conflicts:
#	library/src/main/api14/com/google/android/cameraview/Camera1.java
    @chrbien
    chrbien committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    25bec9d View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2017

  1. Merge branch 'master' of https://github.com/google/cameraview 

    # Conflicts:
#	demo/src/main/res/layout/include_camera.xml
    @chrbien
    chrbien committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    67f7ea4 View commit details
    Browse the repository at this point in the history

  2. update

    @chrbien
    chrbien committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    07bddad View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Merge remote-tracking branch 'upstream/master' 

    # Conflicts:
#	demo/src/main/res/layout/include_camera.xml
#	library/src/main/api14/com/google/android/cameraview/Camera1.java
    @chrbien
    chrbien committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    60f3661 View commit details
    Browse the repository at this point in the history