Gitiles
Code Review Sign In
gerrit.witaqua.org / frameworks_base / d2dff39b587bd073fcf5c97753c8a29e16f4ef57
  1. d2dff39 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  2. b1ca2a0 am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  3. f52fcc7 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  4. 3c1d72c am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  5. ab869de am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  6. cd192c0b am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  7. 704954c am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  8. 28f550f am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  9. 083af20 am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  10. 5f56ea8 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  11. 03a8326 am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  12. f48ab8f am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  13. 531bdb5 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  14. 3b7c09b LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  15. 03c0735 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  16. 08d2007 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  17. fe6f304 Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  18. f5af9a4 am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  19. 209745a am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 12 years ago
  20. 273c5c3 am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  21. c251147 am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 12 years ago
  22. 9ca7a03 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  23. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 12 years ago
  24. e0be42a am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  25. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 12 years ago
  26. 40bfb60 Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  27. 1c55797 Fix build by Deepanshu Gupta · 12 years ago
  28. 8921409 am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 12 years ago
  29. 2100476 am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 12 years ago
  30. 9c7e306 am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  31. b607cb82 am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  32. c261cb0 am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  33. 03bf747f am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  34. 10fb4fe am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 12 years ago
  35. 31a3760a am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 12 years ago
  36. 1b0f605 am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  37. 27c9b56 am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  38. d99dd3e am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 12 years ago
  39. 964023c am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 12 years ago
  40. c1847b5 am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  41. 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 · 12 years ago
  42. 858ab06 am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  43. e969ee5 resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  44. aab6085 am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  45. 4e8b055 am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  46. ec1b4df resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  47. 9358cf0 am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  48. f46900c am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  49. 6dad59e am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  50. 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 · 12 years ago
  51. 87a5405 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  52. 85b7519 resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  53. a154687 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  54. 8c19c6a am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  55. 5878115 resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  56. 16f3a61 am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  57. c0e9c66 resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  58. 1281853 am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  59. eb03602 am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  60. 2de8509 am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  61. 14788ef am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  62. 7d5299c am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  63. 3e7f0a2 am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  64. d4d66df am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  65. 74d2a53 am bb7cfa1e: 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 · 12 years ago
  66. ce68e78 am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  67. c5c49dc am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  68. 776c192 am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  69. 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 · 12 years ago
  70. 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 · 12 years ago
  71. e535ff2 am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  72. 8b78a1d am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  73. f8c5685 resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  74. 060836b am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  75. 9e614b2 am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  76. be2184e am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  77. 81ff5ba am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  78. 3c9fcea am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  79. 0700905 am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  80. 85c5cdc 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 · 12 years ago
  81. 488f624 am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  82. 70efbad am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 12 years ago
  83. 8bf73ea am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 12 years ago
  84. fed25eb am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  85. 204316c am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  86. cfc9e4e am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  87. 72e3fc1 am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  88. 9f00e65 resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  89. c233bb6 am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  90. 8cf3343 am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  91. d62dcc2 am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  92. bd5a3e6 am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 12 years ago
  93. 6f58831 resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  94. 0c98ce5a am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  95. f75f33d am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 12 years ago
  96. 0ad4f2c resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 12 years ago
  97. 5454be0 am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  98. d388afa am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  99. ebd909c am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 12 years ago
  100. b161d6b am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev by Deepanshu Gupta · 12 years ago