Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / ebf9465d213336819b15e3b21d02afce64470d4f
  1. ebf9465 resolved conflicts for merge of ef57e5e0 to stage-aosp-master by Yasuhiro Matsuda · 9 years ago
  2. ef57e5e Merge "Add trace code to system server." by Yasuhiro Matsuda · 9 years ago
  3. 9634307 am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" by Christopher Wiley · 9 years ago
  4. dd80a6c Merge "aidl: Stop using Bionic's test main" by Christopher Wiley · 9 years ago
  5. 1006bfe aidl: Stop using Bionic's test main by Christopher Wiley · 9 years ago
  6. c8e4af6 am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" by Christopher Wiley · 9 years ago
  7. 722bf5c Merge "aidl: Separate aidl logic into its own static library" by Christopher Wiley · 9 years ago
  8. cf47164 am 267cb88f: Merge "Set up aidl for gtest" by Christopher Wiley · 9 years ago
  9. a25d351 aidl: Separate aidl logic into its own static library by Christopher Wiley · 9 years ago
  10. 267cb88 Merge "Set up aidl for gtest" by Christopher Wiley · 9 years ago
  11. 712205b am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." by Nick Kralevich · 9 years ago
  12. 26627d7 am 4d6cb77a: Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 9 years ago
  13. 13786e2 am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" by Dan Willemsen · 9 years ago
  14. a6d1672 am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" by Christopher Wiley · 9 years ago
  15. f7ea7c7 am 1643e97b: Merge "aidl: Pull main() into dedicated file" by Christopher Wiley · 9 years ago
  16. 72b1324 am 2b83384f: Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 9 years ago
  17. 9d58692 Merge "Automatically assign default seinfo labels using the string "default"." by Nick Kralevich · 9 years ago
  18. 5e16bc5 Automatically assign default seinfo labels using the string "default". by Robert Craig · 9 years ago
  19. 4d6cb77 Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 9 years ago
  20. 5b88363 Tighten up compiler flags for aidl by Christopher Wiley · 9 years ago
  21. 60dd5d5 Merge "Remove USE_MINGW, whitelist windows modules" by Dan Willemsen · 9 years ago
  22. a73e004 Merge "Revert "Tighten up compiler flags for aidl"" by Christopher Wiley · 9 years ago
  23. ecaf21c3 Revert "Tighten up compiler flags for aidl" by Christopher Wiley · 9 years ago
  24. 1643e97 Merge "aidl: Pull main() into dedicated file" by Christopher Wiley · 9 years ago
  25. 2f77417 aidl: Pull main() into dedicated file by Christopher Wiley · 9 years ago
  26. 2b83384 Merge "Tighten up compiler flags for aidl" by Christopher Wiley · 9 years ago
  27. eea2353 Tighten up compiler flags for aidl by Christopher Wiley · 9 years ago
  28. 8a8775c Set up aidl for gtest by Casey Dahlin · 9 years ago
  29. 4f8653c am 3fc6f441: (-s ours) Merge "Do not merge namespaces" by Christopher Wiley · 9 years ago
  30. 3fc6f44 Merge "Do not merge namespaces" by Christopher Wiley · 9 years ago
  31. 4aa679f Remove USE_MINGW, whitelist windows modules by Dan Willemsen · 9 years ago
  32. 1ab43d5 Add trace code to system server. by Yasuhiro Matsuda · 9 years ago
  33. 9cc1765 am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs by Rich Slogar · 9 years ago
  34. e85d798 am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  35. 82c66da am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  36. be561e3 am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  37. 8bc8918 am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  38. 5432ab8 am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  39. 44c3a9e am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  40. 18db4f5 am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  41. e40990e am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  42. 575451d am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  43. 8d2e0fb am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  44. e6f7481 am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  45. f2cf3c1 am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  46. 7a7becd am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  47. aae9a10 am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  48. 755b7f3 am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  49. 3ece6d8 am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  50. 4523c86 am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  51. 6d738bb am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  52. c32e8d4 am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  53. d2dd844 am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  54. 9a0c696 am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  55. e870314 am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE] by Jens Ole Lauridsen · 9 years ago
  56. aa5786e am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  57. 93db963 am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  58. 6953cda am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  59. 4ac79e4 am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  60. 65f8923 am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  61. c8e51c1 am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  62. 1e4fbdf am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  63. b19e842 am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  64. 4db2aa3 am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  65. 162a799 am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  66. 5ae9de3 am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  67. 330d610 am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  68. 594f76d am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  69. 14b6538 am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  70. 4efc481 am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  71. 268a461 am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  72. a012a91 am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  73. 54dd25f am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  74. 4c276bb am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  75. 4509e3d am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  76. 7781467 am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  77. 258b56e am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs by Rich Slogar · 9 years ago
  78. a4a1e68 am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  79. c2e98ca am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  80. 58967c6 am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  81. 5d282e3 am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  82. 4753010 am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  83. 4116ed7 am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  84. dfcd35d am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  85. a0bef60 am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  86. af3deb0 am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  87. 554f3a3 am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  88. 4ed5de88 am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  89. dd7d7aa am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  90. 2867759 am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  91. fe0e870 am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  92. b342aba am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  93. 23a7bc9 am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  94. 884cc47 am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  95. d7e001e am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  96. 19229a8 am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  97. c1b987f am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  98. af51c69 am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE] by Deepanshu Gupta · 9 years ago
  99. 7f795d1 am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE] by Jens Ole Lauridsen · 9 years ago
  100. 1df73c5 am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE] by Deepanshu Gupta · 9 years ago