1. db71e5e Merge "FPII-373:set the camera to preview state when unlock the screen" into fp2-dev-v2 by 高艳龙 · 9 years ago
  2. a7d8354 FPII-494:keep the screen on scan image page when Camera onResume by xusai · 9 years ago
  3. 0a1950a FPII-373:set the camera to preview state when unlock the screen by xusai · 9 years ago
  4. aa08cf4 FP2-323: Camcorder does not work. by zhuqk0617 · 9 years ago
  5. 367a1a7 Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE by Shreyas Narayan · 9 years ago
  6. 6cb15e2 merge in lmp-mr1-release history after reset to lmp-mr1-dev by The Android Automerger · 10 years ago
  7. 9149a9b Merge "Vector version of camera preview graphic." into lmp-mr1-dev by Dan Sandler · 10 years ago
  8. 005533a Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev by Dan Sandler · 10 years ago
  9. e6cd71d Vector version of camera preview graphic. by Dan Sandler · 10 years ago
  10. b7a2241 Trim transparent pixels off camera preview bitmaps. by Dan Sandler · 10 years ago
  11. 14f22d5 merge in lmp-mr1-release history after reset to lmp-mr1-dev by The Android Automerger · 10 years ago
  12. bc6bb3b Fix camera latency test b/18239042 by Shaohan Zou · 10 years ago
  13. 4772655 reset to 8dd164a with history. by Qiwen Zhao · 10 years ago
  14. 024c958 merge in lmp-mr1-release history after reset to 6e1f41253728e6870de800f88b5aa2cfde60ee8b by The Android Automerger · 10 years ago
  15. cc2df30 merge in lmp-mr1-release history after reset to 6e1f41253728e6870de800f88b5aa2cfde60ee8b by The Android Automerger · 10 years ago
  16. 6e1f412 Fix camera latency test b/18239042 by Shaohan Zou · 10 years ago
  17. 6d47555 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  18. 8dd164a Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier by Alan Newberger · 10 years ago
  19. 2ebdbd5 Relax aspect ratio matching tolerance for devices with 1.347 ratios by Alan Newberger · 10 years ago
  20. 5a64d11 move size parameter setting before other settings by Alan Newberger · 10 years ago
  21. 3924546 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  22. a1edecd merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  23. 57d8306 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  24. d1f3177 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  25. 0c9534c merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  26. 06a4e10 Forcefully drop 4k recording from pre-L releases. by Sascha Haeberling · 10 years ago
  27. 7acdc00 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  28. 1332fc0 Remove additional dependencies on FloatMath by Sascha Haeberling · 10 years ago
  29. 3705948 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  30. c7beaf1 Fix wear interaction of CaptureModule by Sascha Haeberling · 10 years ago
  31. e11795b Merge "Volantis Device Identifier Helper" into ub-camera-glacier by I-Jong Lin · 10 years ago
  32. 838095a Volantis Device Identifier Helper by I-Jong Lin · 10 years ago
  33. 775b6e6 Merge "consistent style for titles on user education screens" into ub-camera-glacier by Spike Sprague · 10 years ago
  34. 7d7d12b Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier by Spike Sprague · 10 years ago
  35. 9351e87 Prevent unnecessary setVisibility calls in Filmstrip while zooming by Spike Sprague · 10 years ago
  36. 8644ffc Align id selection from QueryTask to sort order from Media query by Alan Newberger · 10 years ago
  37. 29ea836 consistent style for titles on user education screens by Spike Sprague · 10 years ago
  38. 2656b43 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  39. 32ce92d merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  40. 881f395 merge in lmp-mr1-release history after reset to 8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 by The Android Automerger · 10 years ago
  41. 8fb9e06 Adopt the new error handling mechanism in portability. by Senpo Hu · 10 years ago
  42. f4857ff Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier by Spike Sprague · 10 years ago
  43. 770c2b3 Introduce ActionCallback for LocalData items. by Sascha Haeberling · 10 years ago
  44. f3d360e When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons. by Spike Sprague · 10 years ago
  45. 89e3592 merge in lmp-mr1-release history after reset to 0d283729f3cb0bdc3f5afd992e5f49e56d1e5728 by The Android Automerger · 10 years ago
  46. 47e9f17 Merge "Clean up orientation logging" into ub-camera-glacier by Alan Newberger · 10 years ago
  47. e9f7b2d Clean up orientation logging by Alan Newberger · 10 years ago
  48. 1c758c8 Merge "new colors for GAR contrast compliance" into ub-camera-glacier by Spike Sprague · 10 years ago
  49. f44f931 new colors for GAR contrast compliance by Spike Sprague · 10 years ago
  50. 5aad0cb Merge "Stop activity leaks" into ub-camera-glacier by Sascha Haeberling · 10 years ago
  51. 375f9d1 Stop activity leaks by Sascha Haeberling · 10 years ago
  52. f7a18c7 Merge "Null check for buildItemFromData" into ub-camera-glacier by Alan Newberger · 10 years ago
  53. 61c5f9f Null check for buildItemFromData by Alan Newberger · 10 years ago
  54. f4084e3 Check for null when deleting preference groups by Alan Newberger · 10 years ago
  55. b06831a merge in lmp-mr1-release history after reset to 0d283729f3cb0bdc3f5afd992e5f49e56d1e5728 by The Android Automerger · 10 years ago
  56. b2004bc merge in lmp-release history after reset to 91bceebd0bb15a5d20d43f8eca808114b96eb5ce by The Android Automerger · 10 years ago
  57. d78fd61 merge in lmp-release history after reset to 91bceebd0bb15a5d20d43f8eca808114b96eb5ce by The Android Automerger · 10 years ago
  58. b384fd5 merge in lmp-mr1-release history after reset to 0d283729f3cb0bdc3f5afd992e5f49e56d1e5728 by The Android Automerger · 10 years ago
  59. 05edd2e Increase VERBOSE logging for PhotoModule orientation use by Alan Newberger · 10 years ago
  60. b20cf71 Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier by I-Jong Lin · 10 years ago
  61. 7eeb897 Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier by Alan Newberger · 10 years ago
  62. 0aa8c25 Catch exceptions in settings remove helpers by Alan Newberger · 10 years ago
  63. 783fe31 Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier by I-Jong Lin · 10 years ago
  64. 718c43d Secure Camera App survives phone unlock screen by I-Jong Lin · 10 years ago
  65. 0784a83 Button fix for torch when no flash available in hw by I-Jong Lin · 10 years ago
  66. d84c5a6 merge in lmp-mr1-release history after reset to 0d283729f3cb0bdc3f5afd992e5f49e56d1e5728 by The Android Automerger · 10 years ago
  67. 94aa787 merge in lmp-release history after reset to 91bceebd0bb15a5d20d43f8eca808114b96eb5ce by The Android Automerger · 10 years ago
  68. 0d28372 am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  69. 9d87600 am 91bceebd: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  70. 91bceeb Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  71. 63f0ec0 merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4 by The Android Automerger · 10 years ago
  72. 674a124 merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4 by The Android Automerger · 10 years ago
  73. ea77c6b Don't release resources until camera is closed. by Sascha Haeberling · 10 years ago
  74. e664957 Merge "disable startup shimmy on sd card error" into ub-camera-glacier by Spike Sprague · 10 years ago
  75. bd3c03d merge in lmp-release history after reset to 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a by The Android Automerger · 10 years ago
  76. 59add5a merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4 by The Android Automerger · 10 years ago
  77. 4c96d84 disable startup shimmy on sd card error by Spike Sprague · 10 years ago
  78. 7dabda6 Show capturing UI before review UI in intent countdown timer by Alan Newberger · 10 years ago
  79. 1cf0679 Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier by I-Jong Lin · 10 years ago
  80. 20a5930 Merge "Make string comparison robust against null values." into ub-camera-glacier by Sascha Haeberling · 10 years ago
  81. 47008b2 Make string comparison robust against null values. by Sascha Haeberling · 10 years ago
  82. 9efa64a Fix for crash when PhotoApp deletes last Cam pic by I-Jong Lin · 10 years ago
  83. 97a2f9d merge in lmp-release history after reset to 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a by The Android Automerger · 10 years ago
  84. de0b0c3 merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4 by The Android Automerger · 10 years ago
  85. 4a1fd99 Merge "Fix the build break due to ag/567355." into ub-camera-glacier by Senpo Hu · 10 years ago
  86. 4af3ac5 Fix the build break due to ag/567355. by Senpo Hu · 10 years ago
  87. 828081f Merge "Log camera exception via UsageStatistics." into ub-camera-glacier by Senpo Hu · 10 years ago
  88. 74b723c Log camera exception via UsageStatistics. by Senpo Hu · 10 years ago
  89. c6a4887 Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier by Spike Sprague · 10 years ago
  90. 54985c9 Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier by Alan Newberger · 10 years ago
  91. 7387c53 Revert "Make CameraDataAdapter background new data loading and post to listener" by Alan Newberger · 10 years ago
  92. 3972da6 Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier by Alan Newberger · 10 years ago
  93. bda2da2 Migrate Settings Fragment to use arguments by Alan Newberger · 10 years ago
  94. 7a3ce60 Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier by Senpo Hu · 10 years ago
  95. 9746ebe Prevent NullPointerException of PhotoModule in quick resume-pause. by Senpo Hu · 10 years ago
  96. 4ed861a Preview vs Video Camera Resolution Mismatch by I-Jong Lin · 10 years ago
  97. 8d1ac99 disable shutter button as soon as possible to avoid double shutter presses by Spike Sprague · 10 years ago
  98. c974554 merge in lmp-release history after reset to 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a by The Android Automerger · 10 years ago
  99. 8d5da70 merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4 by The Android Automerger · 10 years ago
  100. e9dedb3 Merge "Don't re-open the camera if already open" into ub-camera-glacier by Puneet Lall · 10 years ago