Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 363f4d4e2a53774b7b7c1ea995fc912291f5b84e
  1. 363f4d4 am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  2. 8bf221b Fix error when using list as actionBarNavMode. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  3. 66224e2 am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev by Deepanshu Gupta · 10 years ago
  4. 52ee9b9 am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  5. 12bbbb2 am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev by Deepanshu Gupta · 10 years ago
  6. ffd0e8b am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  7. d332834 am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev by Deepanshu Gupta · 10 years ago
  8. a6f32d7 am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  9. f264080 am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev by Deepanshu Gupta · 10 years ago
  10. 64d4ef8 am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  11. 3ce96ef am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev by Deepanshu Gupta · 10 years ago
  12. 6388948 am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  13. 2db4037 am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  14. 8ed784e am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  15. d181ffe Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev by Deepanshu Gupta · 10 years ago
  16. 4f53d92 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  17. edc8b85 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  18. 20fc473 am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  19. f0336eb am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  20. 2cb287f am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  21. 6530cca Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  22. c39afe4 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  23. f2e2641 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  24. 26819e7 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  25. 9ea996a Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  26. 206c691 am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  27. 72cf03a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  28. 3a544a8 resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  29. a232a68 resolved conflicts for merge of 5476cfee to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  30. 5476cfe am 505c675c: Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  31. 505c675 Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  32. 6274394 am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  33. 8c71ff2 am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  34. 87234e8 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  35. 9c48ab8 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  36. ccf7b2a am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  37. b8e4e8e am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  38. 37f54f4 am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  39. d3ac01f Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  40. 357ebfc Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  41. 5af7324 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  42. da28101 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  43. 979f9c6 am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  44. 5d0db7f am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  45. e30d3fd Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  46. 5455ddc Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  47. 21b0aab Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  48. ffcad24 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  49. 904b89c am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  50. 295184b am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  51. 8782a12 resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  52. b1ca2a0 am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  53. 61fb578 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  54. f52fcc7 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  55. ab869de am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  56. cd192c0b am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  57. 704954c am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  58. 5f56ea8 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  59. 03a8326 am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  60. f48ab8f am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  61. 531bdb5 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  62. 3ff08eb6 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  63. 3b7c09b LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  64. 03c0735 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  65. 08d2007 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  66. fe6f304 Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  67. 273c5c3 am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  68. c251147 am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  69. 9ca7a03 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  70. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  71. e0be42a am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  72. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  73. 40bfb60 Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  74. 1c55797 Fix build by Deepanshu Gupta · 10 years ago
  75. 10fb4fe am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  76. 31a3760 am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  77. 1b0f605 am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  78. 27c9b56 am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  79. d99dd3e am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  80. 964023c am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  81. c1847b5 am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  82. f354d01 am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  83. 858ab06 am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  84. e969ee5 resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  85. aab6085 am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  86. ec1b4df resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  87. 6dad59e am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  88. ccf6b34 am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  89. 87a5405 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  90. 85b7519 resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  91. a154687 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  92. 5878115 resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  93. 16f3a61 am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  94. c0e9c66 resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  95. 2de8509 am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  96. 14788ef am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  97. 7d5299c am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  98. 776c192 am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  99. 26dd61c am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  100. bb7cfa1 am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago