summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Limit start-up screen to N4 + N5Sascha Haeberling2014-05-191-9/+39
| | | | | | Bug: 15024081 Change-Id: I1333a753bc3741d176765ab026cacc1358ab2fca
* Merge "Set a preview callback with a buffer size to force update preview ↵Doris Liu2014-05-192-1/+27
|\ | | | | | | callback stream" into ub-camera-everglades
| * Set a preview callback with a buffer size to force update preview callback ↵Doris Liu2014-05-192-1/+27
| | | | | | | | | | | | | | | | | | | | stream This is the workaround for the same issue that causes b/12210027. It was fixed in KitKat MR2, so we are applying the workaround on KitKat and MR1. Bug: 14954941 Change-Id: Ifba3f9d47769884e81a41277f858e5c7aef41803
* | Add hooks for disabling/enable the mode options toggle between captures.Erin Dahlgren2014-05-192-2/+49
| | | | | | | | | | Bug: 13982230 Change-Id: Ib2582420c2f7fd0038555aed0b23bfa8f151721b
* | Merge "Update session data properly." into ub-camera-evergladesAngus Kong2014-05-161-1/+5
|\ \
| * | Update session data properly.Angus Kong2014-05-161-1/+5
| | | | | | | | | | | | | | | bug:14969759 Change-Id: I39ba063e23482a03cf108931b6c686755dbec91e
* | | Merge "Avoid creating dialog on an activity that is finishing" into ↵Alan Newberger2014-05-161-7/+12
|\ \ \ | |/ / |/| | | | | ub-camera-everglades
| * | Avoid creating dialog on an activity that is finishingAlan Newberger2014-05-161-7/+12
| |/ | | | | | | | | | | | | | | | | | | We have some stack traces in the wild indicating we are trying to create a dialog on the CameraActivity while it is not in a valid state to attach views. Adding an isFinishing check, see more info in the following issue: Bug: 13967353 Change-Id: Ic3c45fa362408f2641527497b15f67686d3aed79
* / Format the megapixel value on the start screen same as settings.Sascha Haeberling2014-05-161-4/+8
|/ | | | | | Bug: 14955075 Change-Id: I1a57a0f9c884ce62cae97c77323c19c390fe2ee7
* Merge "Make new start-up screen accessible." into ub-camera-evergladesSascha Haeberling2014-05-152-10/+3
|\
| * Make new start-up screen accessible.Sascha Haeberling2014-05-152-10/+3
| | | | | | | | | | | | | | | | | | Bug: 14994854 - Make the text on locaiton dialog a label of checkbox - Add content description to aspect ratio image buttons Change-Id: Idbb633205eec35be2ec891e7c8ea079475c5ea3d
* | Merge "Close mode options and mode list when needed." into ub-camera-evergladesSascha Haeberling2014-05-153-11/+19
|\ \
| * | Close mode options and mode list when needed.Sascha Haeberling2014-05-153-11/+19
| |/ | | | | | | | | | | | | Bug: 14834384 Bug: 14834783 Change-Id: Id96859d57a84c66489a0e764ba2950cc47f7c886
* | Merge "fix some lingering exposure comp value calculation errors hide ↵Spike Sprague2014-05-153-7/+25
|\ \ | | | | | | | | | exposure comp button if not supported in hardware" into ub-camera-everglades
| * | fix some lingering exposure comp value calculation errorsSpike Sprague2014-05-153-7/+25
| | | | | | | | | | | | | | | | | | hide exposure comp button if not supported in hardware bug: 13967706 Change-Id: I6aa6963929c00ed06122fa2e2dfd778844bcc280
* | | Use approximate descriptions of aspect ratios.Seth Raphael2014-05-152-11/+42
| |/ |/| | | | | | | | | | | | | 165:98 should be considered close enough and described as 16:9 Bug: 14970245 Change-Id: I75ca9507e453d057c6db3e4fd99cebb0ee01d4f7
* | Merge "pass FilmstripView accessibilty focus events to children" into ↵Spike Sprague2014-05-152-36/+55
|\ \ | | | | | | | | | ub-camera-everglades
| * | pass FilmstripView accessibilty focus events to childrenSpike Sprague2014-05-152-36/+55
| |/ | | | | | | | | | | bug: 14815653 Change-Id: I48c381f87600f2eb11ce29942cdbc7e5f2dae446
* / Always reset position and visibility of newly added views.Sascha Haeberling2014-05-151-5/+5
|/ | | | | | | Bug: 14887734 Bug: 14832742 Change-Id: I9d41a9e89f9c008aad819b52c4d9f0e0d3f54a19
* talkbacK: SCROLL_BACKWARD on first filmstrip item takes you back to cam previewSpike Sprague2014-05-141-1/+8
| | | | | | bug: 14837911 Change-Id: If96a32fbb74da769483f10666e84f89ba14c1735
* Merge "fixed a list range check" into ub-camera-evergladesSpike Sprague2014-05-141-1/+1
|\
| * fixed a list range checkSpike Sprague2014-05-141-1/+1
| | | | | | | | | | bug: 14929888 Change-Id: I1d494cd13d754bbe3c8a4a15b98dbae0be941dc1
* | Merge "Reduce jank after aspect ratio change." into ub-camera-evergladesDoris Liu2014-05-142-11/+39
|\ \ | |/ |/|
| * Reduce jank after aspect ratio change.Doris Liu2014-05-142-11/+39
| | | | | | | | | | | | Also addressed the comment for persisting size in ag/464575 Change-Id: Ief38bf53fdb12016fb6106d712b93dc4aaf048ee
* | Merge "added null check to PhotoModule bottom bar spec for exposure comp ↵Spike Sprague2014-05-141-11/+16
|\ \ | |/ |/| | | params" into ub-camera-everglades
| * added null check to PhotoModule bottom bar specSpike Sprague2014-05-131-11/+16
| | | | | | | | | | | | | | | | for exposure comp params bug: 14624240 Change-Id: Iafbf97d1a024583b81497e7c0ffe4c1848c184df
* | Start up screenDoris Liu2014-05-138-15/+562
| | | | | | | | | | | | | | | | | | This is the 2-step full screen popup: Step 1: (Only for new users) Choose whether geo-tagging should be on Step 2: For new users and upgraders to choose 4:3 or 16:9 preview resolution to take advantage of the screen size. Change-Id: Ibffe5a807cc622a3945b9fd869de1bf7dd660849
* | Merge "Logging for Everglades release." into ub-camera-evergladesAndy Huibers2014-05-132-8/+25
|\ \
| * | Logging for Everglades release.Andy Huibers2014-05-132-8/+25
| | | | | | | | | | | | | | | Bug: 14364757 Change-Id: Ic29b41e7385378e022e388a02af7e4842e7ab9b5
* | | Merge "Handle error getting camera info." into ub-camera-evergladesAngus Kong2014-05-134-56/+168
|\ \ \ | |_|/ |/| |
| * | Handle error getting camera info.Angus Kong2014-05-134-56/+168
| |/ | | | | | | | | bug:13877028 Change-Id: Iff0353738de3290244092076b2f955f0d7d57408
* | Add custom share and edit intent chooser titles.Sascha Haeberling2014-05-131-5/+9
| | | | | | | | | | | | Bug: 14834379 Change-Id: I4534a8129ebc540c86d022d758aabfa0c8fbf23a
* | Merge "Fix wrongly placed null check to prevent app crashes." into ↵Sascha Haeberling2014-05-131-8/+11
|\ \ | | | | | | | | | ub-camera-everglades
| * | Fix wrongly placed null check to prevent app crashes.Sascha Haeberling2014-05-131-8/+11
| |/ | | | | | | | | | | Bug: 13923937 Change-Id: I2a144ba5d7057acb6f49d624695293fd39ed366a
* | fix pano buttons order in landscape orientationSpike Sprague2014-05-131-1/+14
| | | | | | | | | | | | bug: 14886267 Change-Id: I111f24cb1f4f8a07bb96de8c36edeebeba80526a
* | Add wide angle and fish eye capture modes.Scott Ettinger2014-05-131-6/+0
|/ | | | | | bug: 14883143 Change-Id: I57d1257652b3d6d9a2d7a05abea7a45337ec6a03
* Merge "Localize aspect ratios in settings summaries" into ub-camera-evergladesSeth Raphael2014-05-122-2/+35
|\
| * Localize aspect ratios in settings summariesSeth Raphael2014-05-122-2/+35
| | | | | | | | | | Bug: 14496248 Change-Id: I392dc627d09a09980d450ad1dfc93d0e4e5a237c
* | Merge "Do not mutate the List of Sizes passed to helpers" into ↵Seth Raphael2014-05-121-6/+8
|\| | | | | | | ub-camera-everglades
| * Do not mutate the List of Sizes passed to helpersSeth Raphael2014-05-121-6/+8
| | | | | | | | | | | | | | | | This was causing a bug by removing resolutions from a list that was being reused other places. Bug: 14826712 Change-Id: Iaab3bd279b7c517f2a51e582bc4047ef97192122
* | Merge "new pano icons preliminary support for wide-angle and fisheye pano ↵Spike Sprague2014-05-121-0/+6
|\ \ | | | | | | | | | modes" into ub-camera-everglades
| * | new pano iconsSpike Sprague2014-05-121-0/+6
| | | | | | | | | | | | | | | preliminary support for wide-angle and fisheye pano modes Change-Id: I6cb6c62f7f1f1f3a9943501e2de0ba9d718540dd
* | | Merge "Don't use stale parameters for capabilities." into ub-camera-evergladesSascha Haeberling2014-05-121-4/+2
|\ \ \ | |_|/ |/| |
| * | Don't use stale parameters for capabilities.Sascha Haeberling2014-05-121-4/+2
| | | | | | | | | | | | | | | | | | Bug: 14823111 Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc
* | | Do not display large 16x9 option on N5 front camSeth Raphael2014-05-122-6/+9
|/ / | | | | | | | | | | | | | | It was erroneously added to the list of supported resolutions for the Nexus 5 front facing camera Bug: 14819623 Change-Id: I4481c68a473cb790fa67a9648e80302f19bf3065
* | Merge "filmstrip accessibility" into ub-camera-evergladesSpike Sprague2014-05-101-0/+31
|\ \
| * | filmstrip accessibilitySpike Sprague2014-05-091-0/+31
| |/ | | | | | | | | | | | | | | | | | | | | | | | | add support for ACTION_SCROLL_BACKWARD/FORWARD events note: to test this do this 1) turn on talkback 2) launch camera, get into filmstrip 3a) trigger FORWARD event with a left->right->left swipe 3b) trigger BACKWARD event with a right->left->right swipe bug: 14108635 Change-Id: Iabe2d13c6ed96163a5b9139b6674b3457dd1abc1
* | am 1b0fb15d: Do not scale down preview when preview asp is close to screen asp.Doris Liu2014-05-081-3/+21
|\ \ | |/ |/| | | | | * commit '1b0fb15dcb5388ec07a382536d188461bc2d74da': Do not scale down preview when preview asp is close to screen asp.
| * Do not scale down preview when preview asp is close to screen asp.Doris Liu2014-05-081-3/+21
| | | | | | | | | | | | | | | | | | The logic for transforming preview when preview aspect ratio is greater than 14/9 is brought back to achieve the same behavior for preview positioning as we did in Denali release. Bug: 14626812 Change-Id: Ife38efc342cd218aca7d9473ede4db92daebcf54
* | Merge "First Step: CameraCapabilities intead of Parameter" into ↵Angus Kong2014-05-0711-79/+1116
|\ \ | | | | | | | | | ub-camera-everglades