Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / ex / 30fd7d2d82a13dba3580dd848084cba73cdd3eb9
  1. 30fd7d2 resolved conflicts for merge of c78082b6 to master by Chris Craik · 11 years ago
  2. c78082b am b2a3c610: am c38412fd: am a3ac0a2d: Import FrameSequence by Chris Craik · 11 years ago
  3. b2a3c61 am c38412fd: am a3ac0a2d: Import FrameSequence by Chris Craik · 11 years ago
  4. c38412f am a3ac0a2d: Import FrameSequence by Chris Craik · 11 years ago
  5. 6ad0404 Import translations. DO NOT MERGE by Geoff Mendal · 11 years ago
  6. a3ac0a2 Import FrameSequence by Chris Craik · 11 years ago
  7. 5b67708 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  8. 0014f66 Fix make files for unbundled tree builds by John Reck · 11 years ago
  9. 052fc0a Mark framesequence test app strings as untranslatable by Chris Craik · 11 years ago
  10. a3a5443 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  11. 8f65fce Merge "Import FrameSequence" by Chris Craik · 11 years ago
  12. a1265c3 Import FrameSequence by Chris Craik · 11 years ago
  13. 47224cf Add event log tag for Android SNet. by William Luh · 11 years ago
  14. a8ccb2d am e707db99: (-s ours) am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  15. e707db9 am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  16. 95b439e am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  17. c36fa7f am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  18. 58ce8de am 6b48b5de: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  19. ad7bb08 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  20. 6b48b5d Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  21. 16c2fc9 Remove deprecated locales (values-be) by Baligh Uddin · 11 years ago
  22. 7a21dec Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  23. fbe88af Remove deprecated locale (be) by Baligh Uddin · 11 years ago
  24. 4fa4a3f am fdad3f16: am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts by Scott Kennedy · 11 years ago
  25. fdad3f1 am 5e3d1fa1: am 3e8176df: Don\'t show the alternates dialog for GAL contacts by Scott Kennedy · 11 years ago
  26. 5e3d1fa am 3e8176df: Don\'t show the alternates dialog for GAL contacts by Scott Kennedy · 11 years ago
  27. 3e8176d Don't show the alternates dialog for GAL contacts by Scott Kennedy · 11 years ago
  28. 61068ea Remove deprecated locales. by Baligh Uddin · 11 years ago
  29. 6889dfa am e0b8940b: am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op). by Ed Heyl · 11 years ago
  30. e0b8940 am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op). by Ed Heyl · 11 years ago
  31. 4a17a81 am 72dbb5bf: merge in release branch changes (no-op). by Ed Heyl · 11 years ago
  32. 72dbb5b merge in release branch changes (no-op). by Ed Heyl · 11 years ago
  33. 301ff06 camera2: Add updateCaptureRequest method by Zhijun He · 11 years ago
  34. 7d1e224 camera2: Add #resetState to AutoFocusStateMachine by Igor Murashkin · 11 years ago
  35. 44aacce am 400bcf43: am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev by Zhijun He · 11 years ago
  36. f5e6de4 am 5e3b1f15: am 536308c3: am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine by Igor Murashkin · 11 years ago
  37. 400bcf4 am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev by Zhijun He · 11 years ago
  38. 0cc7337 am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev by Zhijun He · 11 years ago
  39. 020e6d9 Merge "camera2: Add updateCaptureRequest method" into klp-dev by Zhijun He · 11 years ago
  40. 5e3b1f1 am 536308c3: am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine by Igor Murashkin · 11 years ago
  41. 536308c am e2fa3d71: camera2: Add #resetState to AutoFocusStateMachine by Igor Murashkin · 11 years ago
  42. d442927 camera2: Add updateCaptureRequest method by Zhijun He · 11 years ago
  43. e2fa3d7 camera2: Add #resetState to AutoFocusStateMachine by Igor Murashkin · 11 years ago
  44. 6079ae6 am 5e1997a0: am ad9d6b03: am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only) by Igor Murashkin · 11 years ago
  45. 5e1997a am ad9d6b03: am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only) by Igor Murashkin · 11 years ago
  46. ad9d6b0 am 2d8e55f4: camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only) by Igor Murashkin · 11 years ago
  47. 2d8e55f camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only) by Igor Murashkin · 11 years ago
  48. 3840bf8 am 98155f86: am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev by Igor Murashkin · 11 years ago
  49. 98155f8 am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev by Igor Murashkin · 11 years ago
  50. 5e9746b am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev by Igor Murashkin · 11 years ago
  51. 1e125c7 Merge "gcam: Add empty SysTrace class" into klp-dev by Igor Murashkin · 11 years ago
  52. b513f30 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  53. 30662b3 gcam: Add empty SysTrace class by Igor Murashkin · 11 years ago
  54. 7b2821e am b7ceb9ae: am 5dab3464: Don\'t translate "Chips Sample" by Scott Kennedy · 11 years ago
  55. b7ceb9a am 5dab3464: Don\'t translate "Chips Sample" by Scott Kennedy · 11 years ago
  56. 5dab346 Don't translate "Chips Sample" by Scott Kennedy · 11 years ago
  57. e44f94d am 86c1b41e: am 93d176ff: am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks by Igor Murashkin · 11 years ago
  58. 86c1b41 am 93d176ff: am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks by Igor Murashkin · 11 years ago
  59. 93d176f am 806d114d: camera2: Harden AutoFocusStateMachine against null values in callbacks by Igor Murashkin · 11 years ago
  60. 806d114 camera2: Harden AutoFocusStateMachine against null values in callbacks by Igor Murashkin · 11 years ago
  61. cf73211 am a41a6d0e: am 926c9905: am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window. by Tony Mantler · 11 years ago
  62. a41a6d0 am 926c9905: am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window. by Tony Mantler · 11 years ago
  63. 926c990 am e444c661: am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window. by Tony Mantler · 11 years ago
  64. e444c66 am eaf43ea2: Don\'t show pop-ups and dialogs if we\'re not attached to a valid window. by Tony Mantler · 11 years ago
  65. ae6930b am 5ba33b0b: am 7d297cff: am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing by Igor Murashkin · 11 years ago
  66. 5ba33b0 am 7d297cff: am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing by Igor Murashkin · 11 years ago
  67. 7d297cf am ba7f0254: camera2: Skip AF state updates when afMode/afState are missing by Igor Murashkin · 11 years ago
  68. eaf43ea Don't show pop-ups and dialogs if we're not attached to a valid window. by Tony Mantler · 11 years ago
  69. ba7f025 camera2: Skip AF state updates when afMode/afState are missing by Igor Murashkin · 11 years ago
  70. b6a57b4 am f7fdaf86: am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs"" by Eino-Ville Talvala · 11 years ago
  71. f7fdaf8 am 35beb4e5: am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs"" by Eino-Ville Talvala · 11 years ago
  72. 35beb4e am 7705b0b8: Revert "Revert "Camera2: Use hidden APIs"" by Eino-Ville Talvala · 11 years ago
  73. 7705b0b Revert "Revert "Camera2: Use hidden APIs"" by Eino-Ville Talvala · 11 years ago
  74. ca0a4a5 am 76978a04: am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs" by Eino-Ville Talvala · 11 years ago
  75. 76978a0 am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs" by Eino-Ville Talvala · 11 years ago
  76. 6102db9 am 08f250d9: Revert "Camera2: Use hidden APIs" by Eino-Ville Talvala · 11 years ago
  77. 08f250d Revert "Camera2: Use hidden APIs" by Eino-Ville Talvala · 11 years ago
  78. 7b80334 am 8390c35f: am 26825617: am 51bb20d6: Camera2: Use hidden APIs by Eino-Ville Talvala · 11 years ago
  79. 8390c35 am 26825617: am 51bb20d6: Camera2: Use hidden APIs by Eino-Ville Talvala · 11 years ago
  80. 2682561 am 51bb20d6: Camera2: Use hidden APIs by Eino-Ville Talvala · 11 years ago
  81. e8f64dd am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev by Scott Kennedy · 11 years ago
  82. 0c8f9ac am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev by Scott Kennedy · 11 years ago
  83. 490e81a Merge chips from jb-ub-mail-ur11 into klp-ub-dev by Scott Kennedy · 11 years ago
  84. 51bb20d Camera2: Use hidden APIs by Eino-Ville Talvala · 11 years ago
  85. 97c9c96 am a2658223: am 44bd229d: am a25c5599: Camera2: Add a blocking state listener by Eino-Ville Talvala · 11 years ago
  86. a265822 am 44bd229d: am a25c5599: Camera2: Add a blocking state listener by Eino-Ville Talvala · 11 years ago
  87. 44bd229 am a25c5599: Camera2: Add a blocking state listener by Eino-Ville Talvala · 11 years ago
  88. a25c559 Camera2: Add a blocking state listener by Eino-Ville Talvala · 11 years ago
  89. 385d4b7 am 6bc47adb: am 15a49e43: am a47d6986: gcam: Make AF more tolerant to transitioning into same state by Igor Murashkin · 11 years ago
  90. 6bc47ad am 15a49e43: am a47d6986: gcam: Make AF more tolerant to transitioning into same state by Igor Murashkin · 11 years ago
  91. 15a49e4 am a47d6986: gcam: Make AF more tolerant to transitioning into same state by Igor Murashkin · 11 years ago
  92. a47d698 gcam: Make AF more tolerant to transitioning into same state by Igor Murashkin · 11 years ago
  93. dbbf87f am 6b9345ec: am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev by Igor Murashkin · 11 years ago
  94. 6b9345e am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev by Igor Murashkin · 11 years ago
  95. 08dbbb5 am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev by Igor Murashkin · 11 years ago
  96. 9fcc895 Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev by Igor Murashkin · 11 years ago
  97. 134cd31 camera2: Add passive unfocused state to AF state machine by Igor Murashkin · 11 years ago
  98. 78ba442 am 3a50b9e1: (-s ours) am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  99. 3a50b9e am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  100. a2ba4d5 am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago