Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 054262cbca1242dc7772ac41328bfb5570aac966
  1. 054262c am 87332a71: resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  2. 87332a7 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  3. ce324a2 am bee6dfe0: am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev by Craig Mautner · 10 years ago
  4. e87d01a am 6ebab792: am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev by Selim Cinek · 10 years ago
  5. 65d0198 am 8c95b359: (-s ours) am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev by Baligh Uddin · 10 years ago
  6. 514be31 am b3a90ee2: am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. by John Spurlock · 10 years ago
  7. 1b0e8eb am 5729f6c0: (-s ours) am 861978f7: (-s ours) am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev by Baligh Uddin · 10 years ago
  8. bee6dfe am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev by Craig Mautner · 10 years ago
  9. 6ebab79 am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev by Selim Cinek · 10 years ago
  10. 8c95b35 am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev by Baligh Uddin · 10 years ago
  11. b3a90ee am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. by John Spurlock · 10 years ago
  12. 5729f6c am 861978f7: (-s ours) am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev by Baligh Uddin · 10 years ago
  13. 1dcc75b am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings" by Andreas Gampe · 10 years ago
  14. 0ce259c Merge "Frameworks/base: Fix AAPT warnings" by Andreas Gampe · 10 years ago
  15. 2412f84 Frameworks/base: Fix AAPT warnings by Andreas Gampe · 10 years ago
  16. 629cf72 am 3f8c8b25: (-s ours) am 5dcb2211: (-s ours) am e575c819: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev by Baligh Uddin · 10 years ago
  17. 89f3665 am 17044459: am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev by Narayan Kamath · 10 years ago
  18. 17be0ea am f9c28899: (-s ours) am eb68a1f0: (-s ours) am 576e8450: (-s ours) am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev by Baligh Uddin · 10 years ago
  19. 42b611e am 37fdb6e9: am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev by Brian Carlstrom · 10 years ago
  20. fa471e9 am 5720328d: am f2bf62c1: am d7b45dd7: am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs by Ricardo Cervera · 10 years ago
  21. 716a6e9 am 7ee1f53d: am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev by Jeff Brown · 10 years ago
  22. 92932a4 am 52ecadbf: am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev by Sungsoo Lim · 10 years ago
  23. 4df8a1e am c2ece422: am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev by Jerome Poichet · 10 years ago
  24. 655adb8 am 923b627a: am c8d5d614: am d0ab6d6d: am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev by Dianne Hackborn · 10 years ago
  25. 3f8c8b2 am 5dcb2211: (-s ours) am e575c819: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev by Baligh Uddin · 10 years ago
  26. 1704445 am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev by Narayan Kamath · 10 years ago
  27. f9c2889 am eb68a1f0: (-s ours) am 576e8450: (-s ours) am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev by Baligh Uddin · 10 years ago
  28. 37fdb6e am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev by Brian Carlstrom · 10 years ago
  29. 5720328 am f2bf62c1: am d7b45dd7: am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs by Ricardo Cervera · 10 years ago
  30. 7ee1f53 am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev by Jeff Brown · 10 years ago
  31. 52ecadb am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev by Sungsoo Lim · 10 years ago
  32. c2ece42 am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev by Jerome Poichet · 10 years ago
  33. 923b627 am c8d5d614: am d0ab6d6d: am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev by Dianne Hackborn · 10 years ago
  34. 65141ae am 5bfbb334: Merge "Merge commit \'62321ab1\' into fix-merge-conflict" into lmp-mr1-dev-plus-aosp by Wink Saville · 10 years ago
  35. 5bfbb33 Merge "Merge commit '62321ab1' into fix-merge-conflict" into lmp-mr1-dev-plus-aosp by Wink Saville · 10 years ago
  36. ed49288 Merge commit '62321ab1' into fix-merge-conflict by Wink Saville · 10 years ago
  37. 6f5b091 am 47c23a22: resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp by Dan Albert · 10 years ago
  38. 47c23a2 resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp by Dan Albert · 10 years ago
  39. fe50cfd am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper." by Dan Albert · 10 years ago
  40. c46dbe8 Merge "Use std::sort instead of qsort_r wrapper." by Dan Albert · 10 years ago
  41. 8a33674 am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev by Craig Mautner · 10 years ago
  42. 1e5e35e am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev by Selim Cinek · 10 years ago
  43. 940d3dd am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev by Baligh Uddin · 10 years ago
  44. 7e67011 am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. by John Spurlock · 10 years ago
  45. 861978f am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev by Baligh Uddin · 10 years ago
  46. 0de19ad Use std::sort instead of qsort_r wrapper. by Dan Albert · 10 years ago
  47. 3867e4d am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev by Craig Mautner · 10 years ago
  48. 9ab8fbb am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev by Craig Mautner · 10 years ago
  49. 245645c Merge "Don't clear visible-behind activity if it is top" into lmp-dev by Craig Mautner · 10 years ago
  50. 1c061d4 am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev by Selim Cinek · 10 years ago
  51. f7ade46 am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev by Baligh Uddin · 10 years ago
  52. 394f29e am cd98a559: am c909e1b2: Zen: Fix new event category check. by John Spurlock · 10 years ago
  53. b8cbdcb am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev by Baligh Uddin · 10 years ago
  54. c0cf74b am 7ed7afb5: am 7f630ae7: am c9ab6f12: am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev by Amit Mahajan · 10 years ago
  55. 8cb387b am 7923da5f: am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev by Adam Lesinski · 10 years ago
  56. a3194bd am e5ee1dec: am 999a1ca9: am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev by Alan Viverette · 10 years ago
  57. 9adaabe am eb659ee3: am c6daadb5: am cf2b684f: am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev by Alan Viverette · 10 years ago
  58. b476d1d am 323807f4: am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev by Vineeta Srivastava · 10 years ago
  59. 9f10be6 am a098449b: am 70f7d14a: am f5e52703: am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev by Vineeta Srivastava · 10 years ago
  60. 2559069 am 93ac1c08: am ef7bf5f0: am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev by Eino-Ville Talvala · 10 years ago
  61. 450654a am 39423cf8: am 075f94b7: am 9d705759: am 6cda1b3f: am 6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev by Svetoslav · 10 years ago
  62. b617680 am bb6a08cf: am a173d9c8: am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033) by Winson Chung · 10 years ago
  63. f4e645b am 2a988941: am cbb42d06: am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev by Winson Chung · 10 years ago
  64. c00f250 am f82897a2: am d2e3bfce: am c139a41c: am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev by Craig Mautner · 10 years ago
  65. cee1790 am 3ea97a8d: am ac40e790: am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev by Adam Powell · 10 years ago
  66. 4589bfa am 0a059f87: am a6a9b86b: am 601fa249: am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev by Alan Viverette · 10 years ago
  67. 7bddd3c am fee7f1b1: am ec81db6a: am c4306923: am 9e6a02b9: am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev by ztenghui · 10 years ago
  68. b73767f am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev by Ruben Brunk · 10 years ago
  69. dd4a133 am ae66513b: am 029a4b98: am 3de5ed51: am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev by Jeff Sharkey · 10 years ago
  70. 42b7a45 am 67787a82: am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev by Dianne Hackborn · 10 years ago
  71. 5327f9a am 047ab3b2: am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev by Svetoslav · 10 years ago
  72. de7772b am 551db03c: am 6d418b43: am db963b1c: am e353ccbf: am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev by Fabrice Di Meglio · 10 years ago
  73. b209a9c am 07f9306e: am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev by Winson Chung · 10 years ago
  74. 9ffa1e2 am 50555892: am edc19979: am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev by Chris Wren · 10 years ago
  75. 445fff1 am 8bac9b5a: am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev by Chris Wren · 10 years ago
  76. 0f4794d am 60c8c86d: am 8c4ba7c3: am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. by Paul Jensen · 10 years ago
  77. 6d7e867 am 58499d61: am 8292b033: am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev by Alexandra Gherghina · 10 years ago
  78. d7c6fd2 am 63f38a08: am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev by Dianne Hackborn · 10 years ago
  79. 8dd27d9 am be1b7ddb: am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev by Winson Chung · 10 years ago
  80. 30fafed am f35be105: am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev by John Spurlock · 10 years ago
  81. d26c9a4 am e9250ae9: am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev by Jason Monk · 10 years ago
  82. 8f2453e2 am c416fb8c: am 8cc88125: am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev by George Mount · 10 years ago
  83. 87a019b am c4b4ffb8: am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. by John Spurlock · 10 years ago
  84. 64ccb70 Don't clear visible-behind activity if it is top by Craig Mautner · 10 years ago
  85. 7ed7afb am 7f630ae7: am c9ab6f12: am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev by Amit Mahajan · 10 years ago
  86. 7923da5 am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev by Adam Lesinski · 10 years ago
  87. e5ee1de am 999a1ca9: am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev by Alan Viverette · 10 years ago
  88. eb659ee am c6daadb5: am cf2b684f: am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev by Alan Viverette · 10 years ago
  89. 323807f am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev by Vineeta Srivastava · 10 years ago
  90. a098449 am 70f7d14a: am f5e52703: am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev by Vineeta Srivastava · 10 years ago
  91. 93ac1c0 am ef7bf5f0: am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev by Eino-Ville Talvala · 10 years ago
  92. 39423cf am 075f94b7: am 9d705759: am 6cda1b3f: am 6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev by Svetoslav · 10 years ago
  93. bb6a08c am a173d9c8: am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033) by Winson Chung · 10 years ago
  94. 2a98894 am cbb42d06: am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev by Winson Chung · 10 years ago
  95. f82897a am d2e3bfce: am c139a41c: am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev by Craig Mautner · 10 years ago
  96. 3ea97a8 am ac40e790: am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev by Adam Powell · 10 years ago
  97. 0a059f8 am a6a9b86b: am 601fa249: am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev by Alan Viverette · 10 years ago
  98. fee7f1b am ec81db6a: am c4306923: am 9e6a02b9: am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev by ztenghui · 10 years ago
  99. e609866 am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev by Ruben Brunk · 10 years ago
  100. ae66513 am 029a4b98: am 3de5ed51: am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev by Jeff Sharkey · 10 years ago