drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,218 Commits 1 Branch 0 Tags
Commit Graph

1759 Commits

Author SHA1 Message Date
Deepanshu Gupta
01fefec939 am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '5fc8f945ee6a763b08e47019319432ec71ba1d1a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:50:45 +00:00
Deepanshu Gupta
5fc8f945ee am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit 'b0f2ded5e9e84fb51ec5b2cb6b419b040b008276':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:45:43 +00:00
Deepanshu Gupta
b0f2ded5e9 am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '40db4a13bc8389dd94cac2fd4c896e10b46c2499':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:39:14 +00:00
Deepanshu Gupta
9ddb073bf7 am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit 'c70ce72a986f029c9f8c43b4060001624176068d':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:29:13 +00:00
Deepanshu Gupta
c70ce72a98 am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit 'af9fde9680922f072981a4853e37ccfcf974920a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:24:10 +00:00
Deepanshu Gupta
af9fde9680 am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '425addb94428d6f17658256a4acd4b62189c8844':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:18:55 +00:00
Deepanshu Gupta
a43aaf00b5 resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b
 2014-05-13 09:49:18 -07:00
Deepanshu Gupta
9c00e6739c am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 16:31:05 +00:00
Deepanshu Gupta
1103ece28c am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 02:02:56 +00:00
Deepanshu Gupta
42556c394b am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:02:54 +00:00
Deepanshu Gupta
202800b12d am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '4d69ca223b268d4ed93baf9d3c354e1df79d55ce':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:02:50 +00:00
Deepanshu Gupta
2fb139e02c resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
 2014-05-12 19:01:41 -07:00
Deepanshu Gupta
06a8702729 am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '995c4d51532dcd4f556e352f273396a70cea88e2':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 02:00:29 +00:00
Deepanshu Gupta
70b2be8e0d am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '59a0f746eb9de9086048419a5aec3dedc7ec9d94':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 02:00:26 +00:00
Deepanshu Gupta
0fef2d24c0 am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'a51ac1bd065904ba7102d1b1565b4a47d7cbcb4a':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 02:00:23 +00:00
Deepanshu Gupta
c7a2737123 am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '09a42524dd693a68517b9827e3d7df77c6bbf537':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 02:00:20 +00:00
Deepanshu Gupta
6f6989f353 am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '80f2914b4b12340ff590882125789144d4f00ce0':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 02:00:17 +00:00
Deepanshu Gupta
6c600df673 am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit 'e686fbced9271cc7e35f4b17c7cd1b43d118ce0f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 02:00:14 +00:00
Deepanshu Gupta
e7c3ed4427 am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '21404483adbd4f26b5a2c7ebee7c09e83f42607e':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 02:00:11 +00:00
Deepanshu Gupta
c88d4c572f am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit 'b172b7805160d4a6875d694cb218fe05b117beb3':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-13 02:00:08 +00:00
Deepanshu Gupta
57c0cf454a am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '71acfa6c1933806a080fc6efb820833f8de68d54':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 02:00:06 +00:00
Deepanshu Gupta
3195ff0afa am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE] 
* commit 'b90db3e6ab1bc89752ce8d7bd286268c41843693':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 02:00:03 +00:00
Deepanshu Gupta
4654bfc14c am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit 'c2a6f3b1eda89365eec2508aec4a3a5024c140e5':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 01:59:58 +00:00
Deepanshu Gupta
863b49ccaa am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '9b89fcc09d0e5da7b81f1910d6ed29b152f730f9':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 01:59:55 +00:00
Deepanshu Gupta
f20c9c660e am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:57:25 +00:00
Deepanshu Gupta
3990ec3490 am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:57:22 +00:00
Deepanshu Gupta
4d69ca223b am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:57:18 +00:00
Deepanshu Gupta
995c4d5153 am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit 'b7bafba7c602150da9c0f06335e3c853e919501c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:55:07 +00:00
Deepanshu Gupta
59a0f746eb am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '51dd8878cb401128d730aecf9fe18c1e06221ac4':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 01:55:04 +00:00
Deepanshu Gupta
a51ac1bd06 am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '503aaa48e47538b69dc477372bc8c4ad2e955227':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 01:55:02 +00:00
Deepanshu Gupta
09a42524dd am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '30db282f2a3692f8c98cb3bdbb0534ad348d1bd7':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 01:54:59 +00:00
Deepanshu Gupta
80f2914b4b am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit 'b67b1b450c1f35bd60882b7beec1dbfb47cd84f1':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 01:54:56 +00:00
Deepanshu Gupta
e686fbced9 am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '2c8fea2ad425c4ba371bcb678949613dc8db72d0':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 01:54:53 +00:00
Deepanshu Gupta
21404483ad am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '0bb06b91e7be5b7f8c397295094aeaf1df8dbb09':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 01:54:50 +00:00
Deepanshu Gupta
b172b78051 am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit 'f326473865d0860badcc39979b8965a6a2f28ae7':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-13 01:54:48 +00:00
Deepanshu Gupta
71acfa6c19 am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '49d47a02e8c767d81815827a8170d015db6ea2d4':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 01:54:44 +00:00
Deepanshu Gupta
b90db3e6ab am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE] 
* commit 'de3b2c06ab05d1fbbf643b7ec3377d25997697d9':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 01:54:42 +00:00
Deepanshu Gupta
c2a6f3b1ed am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '2f94c1db0d2c7e68891c3d96732fe39b199fac5d':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 01:54:39 +00:00
Deepanshu Gupta
9b89fcc09d am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'ef9596a1ea7c39cd07b81e87dca7f8f1941056b7':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 01:54:36 +00:00
Deepanshu Gupta
bdd8dc332b am 52a86f17: am 7f56beb8: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '52a86f17ea4940561c6d73ac226bef177a84c035':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:52:38 +00:00
Deepanshu Gupta
12e1ac320d am 680219f2: am f61bd002: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '680219f2e3d67fa672bf3b8d7216a5bb61a0905d':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 01:52:35 +00:00
Deepanshu Gupta
6b9e07a412 am 78b176b3: am d558ebdb: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '78b176b34c9330aaa1142f922c222faa600eb9c8':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 01:52:32 +00:00
Deepanshu Gupta
17c894d3d9 am a4384d4e: am a98121ef: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit 'a4384d4e8ccc78b2e005e3eb06dd2d3d81d781af':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 01:52:28 +00:00
Deepanshu Gupta
9f2f5e776a am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE] 
* commit '2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 01:52:25 +00:00
Deepanshu Gupta
616141bdcc am d9a137bd: am 77048379: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit 'd9a137bd84a0ebbcd34801da1442f8a6b0413c3e':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 01:52:25 +00:00
Deepanshu Gupta
06c4f23d73 am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:52:21 +00:00
Deepanshu Gupta
cdb87d8d83 am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'a59c27dd6674a31c875b0baa86519caec628ca2d':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:52:18 +00:00
Deepanshu Gupta
edae4e6951 am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '8a39c3afb29f2540b05319042e758dd4d5f73a1e':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:52:15 +00:00
Deepanshu Gupta
c014eb681b am 7a5f7265: Merge "Support actionProviderClass attribute for menus [DO NOT MERGE]" into klp-dev 
* commit '7a5f726525f597bf5dd65fd6bb106511715c2109':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:42:42 +00:00
Deepanshu Gupta
2d82586b96 Fix CalendarView to show the right labels. [DO NOT MERGE] 
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)
 2014-05-05 18:32:04 -07:00