summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix Camera2 build.Mangesh Ghiware2013-10-141-1/+2
| | | | | Bug: 11226016 Change-Id: Ib667e52a150ffad44575ea97174f9d13de1d7b5e
* Use Gallery intents by default.Mangesh Ghiware2013-10-142-4/+40
| | | | | Bug: 11226016 Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
* Merge "Updating shutter button resources" into gb-ub-photos-carlsbadSascha Haeberling2013-10-1564-0/+0
|\
| * Updating shutter button resourcesSascha Haeberling2013-10-1464-0/+0
| | | | | | | | | | | | Bug: 11155984 Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
* | Merge "Set camera controls visibility based on whether the camera preview is ↵Erin Dahlgren2013-10-149-11/+153
|\ \ | |/ |/| | | centered." into gb-ub-photos-carlsbad
| * Set camera controls visibility based on whether the camera preview is centered.Erin Dahlgren2013-10-149-11/+153
| | | | | | | | | | Bug: 10861015 Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
* | Updating button assets, follow-up to http://ag/373177Sascha Haeberling2013-10-1410-0/+0
| | | | | | | | | | | | Bug: 11155984 Change-Id: Ib1cbf5cf53f30e45751804f6d9d25afa127df99a
* | Merge "Fix SRI upside down preview in reverse landscape and reverse ↵Doris Liu2013-10-143-8/+31
|\ \ | |/ |/| | | portrait" into gb-ub-photos-carlsbad
| * Fix SRI upside down preview in reverse landscape and reverse portraitDoris Liu2013-10-143-8/+31
| | | | | | | | | | | | | | | | | | Also make sure preview is not upside down after device flip, and fix camera controls jiggering during rotation Bug: 11216647 Bug: 11174540 Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
* | Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbadztenghui2013-10-141-5/+5
|\ \ | |/ |/|
| * Only delete the Uri coming from onMediaSavedztenghui2013-10-141-5/+5
| | | | | | | | | | | | | | | | | | | | The incoming Uri can be null, or a file Uri, which we don't want to delete. The Uri from onMediaSaved has been inserted to the MediaStore and pass null check. bug:11218007 Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
* | Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbadAngus Kong2013-10-141-0/+3
|\ \
| * | Ignore clicks on disabled pie menu items.Angus Kong2013-10-131-0/+3
| | | | | | | | | | | | | | | | | | bug:11205671 Change-Id: I8b7c8c6b95f2cedadc064747470acd742280eb7f
* | | Merge "Workaround to prevent the data focus callback." into ↵Angus Kong2013-10-143-10/+22
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Workaround to prevent the data focus callback.Angus Kong2013-10-133-10/+22
| |/ / | | | | | | | | | | | | | | | bug:11205669 Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
* | | Change keyguard camera layout to show no menu options in indicatorAlan Newberger2013-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are situations where the user selected options e.g. hdr+ are the initial indicators to the camera, so showing autoflash on the fake layout seems janky. additionally I sometimes see camera showing its own default clean circle indicator layout prior to switching to whatever indicators are active. For both these reasons it seems better to start secure camera from lockscreen with an empty circle indicator. I tried this CL out on my device and can confirm it feels less janky. Bug: 11206325 Change-Id: Ia694a21e5c86f9e12a339679aa30f4b21f1fa23b
* | | Merge "Add 'disabled' state for when Gcam is unable to take another shot." ↵Sascha Haeberling2013-10-1325-0/+21
|\ \ \ | | | | | | | | | | | | into gb-ub-photos-carlsbad
| * | | Add 'disabled' state for when Gcam is unable to take another shot.Sascha Haeberling2013-10-1325-0/+21
| |/ / | | | | | | | | | | | | | | | Bug: 11113201 Change-Id: I887104dc79f4a7a83bb79b2d30c0289fc90c9022
* | | Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbadDoris Liu2013-10-133-26/+25
|\ \ \ | |/ / |/| |
| * | Fix for mis-placed camera controlsDoris Liu2013-10-133-26/+25
| | | | | | | | | | | | | | | Bug: 11205682 Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
* | | Don't load data when it's secure camera.Angus Kong2013-10-131-1/+5
|/ / | | | | | | | | | | bug:11063164 Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
* | Adjust the position after layout change.Angus Kong2013-10-121-20/+20
| | | | | | | | | | | | bug:10993660 Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
* | Merge "Correct initial orientation of camera controls" into ↵Doris Liu2013-10-123-44/+61
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Correct initial orientation of camera controlsDoris Liu2013-10-113-44/+61
| | | | | | | | | | | | | | | Bug: 8878379 Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
* | | Merge "Finish the secure camera activity when user try to play a video." ↵ztenghui2013-10-121-5/+13
|\ \ \ | |/ / |/| / | |/ into gb-ub-photos-carlsbad
| * Finish the secure camera activity when user try to play a video.ztenghui2013-10-111-5/+13
| | | | | | | | | | | | bug:11190995 Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
* | Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbadDoris Liu2013-10-122-12/+6
|\ \ | |/ |/|
| * Bring full screen window flag back to cameraDoris Liu2013-10-112-12/+6
| | | | | | | | | | Bug: 11027091 Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
* | restore Usage StatisticsSeth Raphael2013-10-111-0/+2
| | | | | | | | | | | | | | initialize was not being called anywhere. Bug: 11188914 Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894
* | Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
|/ | | | | | | | Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'. Leaving existing strings to pipeline translations before implementing the migration to these strings. Bug: 11185194 Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
* Merge "gcam: Allow debugging postcapture image to be added to mediastore." ↵Ruben Brunk2013-10-111-4/+15
|\ | | | | | | into gb-ub-photos-carlsbad
| * gcam: Allow debugging postcapture image to be added to mediastore.Ruben Brunk2013-10-101-4/+15
| | | | | | | | | | Bug: 11010544 Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
* | Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbadAngus Kong2013-10-111-4/+17
|\ \
| * | Avoid unnecessary bringChildToFront() calls.Angus Kong2013-10-111-4/+17
| | | | | | | | | | | | | | | | | | bug:10750719 Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
* | | Don't show a details dialog if there are no details.Sascha Haeberling2013-10-101-1/+3
| | | | | | | | | | | | | | | | | | Bug: 11021907 Change-Id: Ie4919889f60f2035fbd6f8b99bff4415e2962ae6
* | | Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbadSascha Haeberling2013-10-111-3/+3
|\ \ \
| * | | Don't initialize photo module if it's paused.Sascha Haeberling2013-10-101-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11028614 The main visible issue with this is that we register additional location listeners, thus draining battery as we don't unregister them ever. Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1
* | | Merge "Check both the requestId of current item and total items in filmstrip ↵Erin Dahlgren2013-10-111-7/+5
|\ \ \ | | | | | | | | | | | | for bottom controls." into gb-ub-photos-carlsbad
| * | | Check both the requestId of current item and total items in filmstrip for ↵Erin Dahlgren2013-10-101-7/+5
| | |/ | |/| | | | | | | | | | | | | | | | bottom controls. Bug: 11169201 Change-Id: I9d42b168efe62712f76165db5221757a1f20013f
* | | Add fling support in zoom viewDoris Liu2013-10-101-4/+120
| | | | | | | | | | | | | | | | | | Bug: 10679704 Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd
* | | Merge "Remove display change listener for mode switch" into ↵Doris Liu2013-10-115-2/+24
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Remove display change listener for mode switchDoris Liu2013-10-105-2/+24
| | | | | | | | | | | | | | | Bug: 10928549 Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
* | | Merge "Hide the status bar and switch into lights-out mode when popup is ↵Sascha Haeberling2013-10-103-4/+19
|\ \ \ | |_|/ |/| | | | | dimissed." into gb-ub-photos-carlsbad
| * | Hide the status bar and switch into lights-out mode when popup is dimissed.Sascha Haeberling2013-10-103-4/+19
| | | | | | | | | | | | | | | | | | Bug: 11119286 Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
* | | Merge "Workaround for re-applying transform on new surface texuture" into ↵Doris Liu2013-10-101-7/+5
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Workaround for re-applying transform on new surface texutureDoris Liu2013-10-101-7/+5
| | | | | | | | | | | | | | | Bug: 10981460 Change-Id: Ic7fca757f3c1171317c76cd90fad43ff5c5ae5d2
* | | Merge "Update shutter recording assets." into gb-ub-photos-carlsbadMindy Pereira2013-10-1020-0/+0
|\ \ \
| * | | Update shutter recording assets.Mindy Pereira2013-10-0920-0/+0
| |/ / | | | | | | | | | | | | | | | fixes b/11155984 SRI pano shutter button inconsistent Change-Id: I6b4c8419d4cd3814287edf932dcdfcc8b91e49e6
* | | Merge "Fix flash issue" into gb-ub-photos-carlsbadztenghui2013-10-102-1/+2
|\ \ \ | |_|/ |/| |
| * | Fix flash issueztenghui2013-10-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flash light should show up at the same time as the control show up. Also, when we change the flash mode, we should update the flash on screen indicator. bug:11064667 Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0