Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 69e7ff3a0c656041bff2fdd8b7190d3ee7d30a8c
  1. 69e7ff3 am cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  2. cf72f25 Fix incorrect merge conflict to klp-modular-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  3. 4c37b79 Merge "Class for managing the active scorer application." by Jeff Davidson · 10 years ago
  4. 047f3c7 resolved conflicts for merge of 3ee9dc58 to master by Jeff Brown · 10 years ago
  5. dd6fd1e Class for managing the active scorer application. by Jeff Davidson · 10 years ago
  6. 3ee9dc5 am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev by Jeff Brown · 10 years ago
  7. fa72a9e Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev by Jeff Brown · 10 years ago
  8. 2adb422 Merge "media: don't rely on Java 6 parseInt error on leading '+' sign" by Lajos Molnar · 10 years ago
  9. a46ceb5 Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()." by Dan Sandler · 10 years ago
  10. 1c3f332 Declare VersionCodes.KITKAT_WATCH. by Jeff Brown · 10 years ago
  11. 63e4017 Fix NPE if showKeyguard() is not called before hideKeyguard(). by Dan Sandler · 10 years ago
  12. 934ef05 am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev by Craig Mautner · 10 years ago
  13. 4b81e89 am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev by Craig Mautner · 10 years ago
  14. 2fd3cb9 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev by Craig Mautner · 10 years ago
  15. e3a00d7 Fix ActivityContainer callback parcelling. by Craig Mautner · 10 years ago
  16. 2f894fe am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" by Mark Salyzyn · 10 years ago
  17. aa09200 am 6c925305: am 2760778d: jni: liblog reading error API incorrect by Mark Salyzyn · 10 years ago
  18. 24dbfdaa am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" by Mark Salyzyn · 10 years ago
  19. 6c92530 am 2760778d: jni: liblog reading error API incorrect by Mark Salyzyn · 10 years ago
  20. 2d308a5 am 6725580a: am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  21. 79c9285 am b873a0a3: (-s ours) am 985bb326: am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  22. 911ad51 am 06f4c8c7: (-s ours) am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  23. 36e8b4d am a84a1753: (-s ours) am 0cffa9fe: am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  24. c923795 am 43e229a1: (-s ours) am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  25. 8d966e4 Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event" by Wink Saville · 10 years ago
  26. 6725580 am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  27. b873a0a am 985bb326: am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  28. 06f4c8c am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  29. a84a175 am 0cffa9fe: am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  30. 43e229a am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  31. 936e87e am 5788722d: Merge "frameworks: 64 bit compile issues" by Mark Salyzyn · 10 years ago
  32. 3d72c06 Merge "Remove activitystrings.xml from localized resource directories" by Baligh Uddin · 10 years ago
  33. 74e1482 am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev by Deepanshu Gupta · 10 years ago
  34. 2760778 jni: liblog reading error API incorrect by Mark Salyzyn · 10 years ago
  35. 5a3df66 am 35d46778: (-s ours) resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  36. 5788722 Merge "frameworks: 64 bit compile issues" by Mark Salyzyn · 10 years ago
  37. 492090a am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev by Deepanshu Gupta · 10 years ago
  38. 97114e6 am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  39. 985bb32 am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  40. 884f3b1 am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  41. 0cffa9f am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  42. 38f2b1e am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  43. 35d4677 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  44. 72bbe6c media: don't rely on Java 6 parseInt error on leading '+' sign by Lajos Molnar · 10 years ago
  45. 16191f8 resolved conflicts for merge of 0e2049cd to klp-modular-dev by Deepanshu Gupta · 10 years ago
  46. 34de7a8 Merge "Stub APIs for network scoring." by Jeff Davidson · 10 years ago
  47. b51e0a6 Stub APIs for network scoring. by Jeff Davidson · 10 years ago
  48. 9cc58eb am 82d5f137: (-s ours) am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  49. 13ed576 am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  50. fa20612 am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  51. 925b911 am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  52. 43f1fe7 am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  53. 30ab17d am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  54. cda504f am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  55. 502c83f am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  56. 013af33 am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  57. 5016f76 am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  58. 289f1ff am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  59. 82d5f13 am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  60. 9468826 am f2d085e8: (-s ours) am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  61. f85b903 am 110a05c6: (-s ours) am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  62. ec6676d am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  63. e5d0fce am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  64. 0aea468 am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  65. 0031284 am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  66. 4eeaa61 am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  67. b03e117 am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  68. 90b0b69 am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  69. f2d085e am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  70. 110a05c am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  71. 0e2049c am bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  72. 8638488 am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  73. 685b7d4 am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  74. 91f2a7c am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  75. 0fe6347 am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  76. 87e1418 am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  77. 533a52f am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  78. 014ac85 am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  79. d023360 am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  80. 2aee071 am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  81. 5a12505 Merge changes I66792c4d,I203b6783 into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  82. 04b4f8d Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  83. fb120ac Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  84. b7fd631 Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  85. f14cbb2 Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  86. 484c88c am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  87. e75477c am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  88. 6a4a946 Merge "Data structures for communication with network scorer apps." by Jeff Davidson · 10 years ago
  89. dc960e2 Data structures for communication with network scorer apps. by Jeff Davidson · 10 years ago
  90. 3c24bb4 Merge "Implement jumpToCurrentState() in VectorDrawable" by Alan Viverette · 10 years ago
  91. 8539403 frameworks: 64 bit compile issues by Mark Salyzyn · 10 years ago
  92. d67d073 Merge "Rename basePkg to opPkg" by Christoph Studer · 10 years ago
  93. 1723d6f Remove activitystrings.xml from localized resource directories by Baligh Uddin · 10 years ago
  94. fe08369 Merge "Fixing the alternate recents transition on landscape views." by Winson Chung · 10 years ago
  95. 2820c45 Fixing the alternate recents transition on landscape views. by Winson Chung · 10 years ago
  96. 8fd7f1e Rename basePkg to opPkg by Christoph Studer · 10 years ago
  97. 3eff39f Merge "Revert "Import translations. DO NOT MERGE"" by Baligh Uddin · 10 years ago
  98. abe94cf Revert "Import translations. DO NOT MERGE" by Baligh Uddin · 10 years ago
  99. 97096fd Merge "Write eventlog entries for notification visibility" by Christoph Studer · 10 years ago
  100. 7553434 am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 10 years ago