Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / d4d46587665ede9cdd26d12d37368a35232a31e1
  1. d4d4658 resolved conflicts for merge of 90b39aba to master-lockscreen-dev by Colin Cross · 11 years ago
  2. 90b39ab Merge "fix build" by Colin Cross · 11 years ago
  3. 0b65c56 fix build by Colin Cross · 11 years ago
  4. 923914b am eed2be4e: Merge "Fix support for TouchFeedbackDrawable tint mode" by Alan Viverette · 11 years ago
  5. eed2be4 Merge "Fix support for TouchFeedbackDrawable tint mode" by Alan Viverette · 11 years ago
  6. bd35c5f am f0e74f08: Merge "Add equals, hashCode, and toString methods in TvInputInfo." by Sungsoo Lim · 11 years ago
  7. d30688f Fix support for TouchFeedbackDrawable tint mode by Alan Viverette · 11 years ago
  8. f0e74f0 Merge "Add equals, hashCode, and toString methods in TvInputInfo." by Sungsoo Lim · 11 years ago
  9. 89978ab Add equals, hashCode, and toString methods in TvInputInfo. by Sungsoo Lim · 11 years ago
  10. 3b5f852 am 494fb7b5: Update volume panel by Alan Viverette · 11 years ago
  11. 494fb7b Update volume panel by Alan Viverette · 11 years ago
  12. f781a9b am c095ca1c: Merge "Corp badging for Recents" by Amith Yamasani · 11 years ago
  13. c095ca1 Merge "Corp badging for Recents" by Amith Yamasani · 11 years ago
  14. 4f0a49e Corp badging for Recents by Amith Yamasani · 11 years ago
  15. 94d3f30 am 438d77e0: MediaFrameworkTest: Fix Camera2 API unit test build breakage by Zhijun He · 11 years ago
  16. 438d77e MediaFrameworkTest: Fix Camera2 API unit test build breakage by Zhijun He · 11 years ago
  17. 58aae51 Merge "Set a dark theme for SystemUI." into master-lockscreen-dev by Adrian Roos · 11 years ago
  18. 070a0b6 Set a dark theme for SystemUI. by Adrian Roos · 11 years ago
  19. 55e41ea am 316e533a: Merge "Update brightness icons to use color attribute" by Alan Viverette · 11 years ago
  20. 316e533 Merge "Update brightness icons to use color attribute" by Alan Viverette · 11 years ago
  21. 515a48a Update brightness icons to use color attribute by Alan Viverette · 11 years ago
  22. b2fb69f am cf3f3c27: Merge "MediaFocusControl: fix comment" by Jean-Michel Trivi · 11 years ago
  23. cf3f3c2 Merge "MediaFocusControl: fix comment" by Jean-Michel Trivi · 11 years ago
  24. 262ef08 Merge "Hide back button on keyguard and make it work for bouncer." into master-lockscreen-dev by Jorim Jaggi · 11 years ago
  25. 397e411 Merge "Fix first child handling with GONE children." into master-lockscreen-dev by Selim Cinek · 11 years ago
  26. 9f347ae Fix first child handling with GONE children. by Jorim Jaggi · 11 years ago
  27. 3c14939 am 8a5c99c9: Merge "Fix path interpretation on curves" by ztenghui · 11 years ago
  28. 8a5c99c Merge "Fix path interpretation on curves" by ztenghui · 11 years ago
  29. 5520fba am 6d954bbd: Merge "Fix build breakage" by Raph Levien · 11 years ago
  30. c1776b1 am 822bbb38: Merge "Make attachFunctor blocking" by John Reck · 11 years ago
  31. 6d954bb Merge "Fix build breakage" by Raph Levien · 11 years ago
  32. 822bbb3 Merge "Make attachFunctor blocking" by John Reck · 11 years ago
  33. 3931949 Fix build breakage by Raph Levien · 11 years ago
  34. f51e113 MediaFocusControl: fix comment by Jean-Michel Trivi · 11 years ago
  35. d3d8daf Make attachFunctor blocking by John Reck · 11 years ago
  36. 8809f18 am 4b1a7c20: Fix build breakage by Alan Viverette · 11 years ago
  37. f039afd am a47c3cc5: Merge "Remove sync flush" by John Reck · 11 years ago
  38. 584a7aa resolved conflicts for merge of ff0978fd to master-lockscreen-dev by Jorim Jaggi · 11 years ago
  39. 4b1a7c2 Fix build breakage by Alan Viverette · 11 years ago
  40. a47c3cc Merge "Remove sync flush" by John Reck · 11 years ago
  41. ff0978f Merge "Further improved NotificationStackScroller" by Selim Cinek · 11 years ago
  42. a0b2be8 am dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst." by Jianing Wei · 11 years ago
  43. dcb495f Merge "Camera2 API: enable burst capture and repeating burst." by Jianing Wei · 11 years ago
  44. 53461fa am de5a29de: Merge "Cleaning up VectorDrawable" by Alan Viverette · 11 years ago
  45. d2c3a82 Camera2 API: enable burst capture and repeating burst. by Jianing Wei · 11 years ago
  46. dd137a8 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev by Svetoslav · 11 years ago
  47. 0c5c18a Merge "Implement camera affordance" into master-lockscreen-dev by Adrian Roos · 11 years ago
  48. de5a29d Merge "Cleaning up VectorDrawable" by Alan Viverette · 11 years ago
  49. 1685e63 Further improved NotificationStackScroller by Selim Cinek · 11 years ago
  50. 6be2f95 Merge "Adding render stats APIs to UiAutomation (framework)." by Svetoslav · 11 years ago
  51. 93a03d9 am 2bb8dde4: Merge "support the people extra on the notification object" by Chris Wren · 11 years ago
  52. 2bb8dde Merge "support the people extra on the notification object" by Chris Wren · 11 years ago
  53. dde7530 support the people extra on the notification object by Chris Wren · 11 years ago
  54. e5c7a89 Hide back button on keyguard and make it work for bouncer. by Jorim Jaggi · 11 years ago
  55. 4b3988d Cleaning up VectorDrawable by Alan Viverette · 11 years ago
  56. 8ca3eec Remove sync flush by John Reck · 11 years ago
  57. 65b68aa Merge "Limit notifications on lockscreen to a maximum 4." into master-lockscreen-dev by Jorim Jaggi · 11 years ago
  58. ddcb8c6 am 2271a91c: (-s ours) am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  59. 2271a91 am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  60. cd5e3f8 am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  61. 3243040 am 8c22e367: (-s ours) Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  62. da6b959 Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  63. 8c22e36 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  64. ecbc809 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev by Baligh Uddin · 11 years ago
  65. 5e25caa Implement camera affordance by Adrian Roos · 11 years ago
  66. d4a5744 Limit notifications on lockscreen to a maximum 4. by Jorim Jaggi · 11 years ago
  67. 17f2fdd am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" by Paul Lawrence · 11 years ago
  68. 9502f99 Merge "Allow encryption when keyguard is set to pattern or no protection" by Paul Lawrence · 11 years ago
  69. f441656 am edd6d9e3: am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" by Narayan Kamath · 11 years ago
  70. edd6d9e am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" by Narayan Kamath · 11 years ago
  71. 3603970 am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" by Narayan Kamath · 11 years ago
  72. 940e76f am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" by Narayan Kamath · 11 years ago
  73. b827f78 Merge "Removed android.debug.JNITest from preloaded-classes" by Narayan Kamath · 11 years ago
  74. 2a6599d am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" by Narayan Kamath · 11 years ago
  75. 954a466 am d11f223c: resolved conflicts for merge of 286a247e to master by Narayan Kamath · 11 years ago
  76. f148f36 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" by Narayan Kamath · 11 years ago
  77. d11f223 resolved conflicts for merge of 286a247e to master by Narayan Kamath · 11 years ago
  78. 9e289d7 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" by Narayan Kamath · 11 years ago
  79. 286a247 am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." by Narayan Kamath · 11 years ago
  80. 1d26a3f am 09e13cc5: Merge "System services detect and register app CPU ABIs" by Narayan Kamath · 11 years ago
  81. 0fd40cb am 80413c9f: Merge "Re-implement native library search and copies." by Narayan Kamath · 11 years ago
  82. 09e13cc Merge "System services detect and register app CPU ABIs" by Narayan Kamath · 11 years ago
  83. 80413c9 Merge "Re-implement native library search and copies." by Narayan Kamath · 11 years ago
  84. e61981c am e5e8444c: Merge "Allow setting the active admin across users." by Jessica Hummel · 11 years ago
  85. e5e8444 Merge "Allow setting the active admin across users." by Jessica Hummel · 11 years ago
  86. 6d36b60 Allow setting the active admin across users. by Jessica Hummel · 11 years ago
  87. ad9fa8b am 9ce83761: Merge "Camera2: Add MANUAL capture intent" by Zhijun He · 11 years ago
  88. 9ce8376 Merge "Camera2: Add MANUAL capture intent" by Zhijun He · 11 years ago
  89. e30adb7 Camera2: Add MANUAL capture intent by Zhijun He · 11 years ago
  90. f6a021c am 7e6fe14f: am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev by Zhihai Xu · 11 years ago
  91. db3e065 am ece41093: am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev by Jesse Gunsch · 11 years ago
  92. 7e6fe14 am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev by Zhihai Xu · 11 years ago
  93. ece4109 am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev by Jesse Gunsch · 11 years ago
  94. 04c9040 am 9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree" by John Reck · 11 years ago
  95. 9817ddd Merge "Merge hasFunctors & pushStaging into prepareTree" by John Reck · 11 years ago
  96. 898fe18 Merge "Keep lockscreen open when all notifications are gone" into master-lockscreen-dev by Adrian Roos · 11 years ago
  97. def26cb4 am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib" by Deepanshu Gupta · 11 years ago
  98. f4198b7 Merge hasFunctors & pushStaging into prepareTree by John Reck · 11 years ago
  99. 2718e1f3 Keep lockscreen open when all notifications are gone by Adrian Roos · 11 years ago
  100. 8aa7a96 Merge "Support custom views using TimePickerDialog in layoutlib" by Deepanshu Gupta · 11 years ago