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

115638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
513bf25d7a am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '5b42e1ae5576f95d9d561a15674e392657f64120':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:31:40 +00:00
Deepanshu Gupta
0d90b43b58 am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit 'cb2400661a6019cfc6f2fef75d92767f6d7547b6':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:31:38 +00:00
Deepanshu Gupta
51cce0ec42 resolve conflicts for merge 5a7b3b65 correctly 
Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
 2014-05-12 19:31:25 -07:00
Deepanshu Gupta
5b42e1ae55 am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'b5b4d6eb790ec344680f92f75edd75c427058266':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:27:24 +00:00
Deepanshu Gupta
cb2400661a am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '977ede48a26e9c1a9f5f840448edadd89255b161':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:27:21 +00:00
Deepanshu Gupta
b5b4d6eb79 am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'a7c0d02ad6b161b5084abc8a2740f7e783d4ad1e':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:21:57 +00:00
Deepanshu Gupta
977ede48a2 am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '51ce58a7bb2798c2aac1f5a1d76deaeab27e21da':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:21:54 +00:00
Deepanshu Gupta
7377c7be6a am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE] 
* commit '3a115628236ee9051518d4f96840cbb76070cf92':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 02:20:58 +00:00
Deepanshu Gupta
9359dc2e7d am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '2d3fa7ba782238afb891db38e29ef7ec755bfdf6':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 02:20:54 +00:00
Deepanshu Gupta
df2da3d7c9 am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '7bc363ba72d4cdd9a0b3b1601e432acfc09c0dc0':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 02:20:51 +00:00
Deepanshu Gupta
4eab4e14c8 am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '5268248e0708951966e4f6514736a4030d5052da':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 02:20:47 +00:00
Deepanshu Gupta
00d0964901 am 85f53c33: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '85f53c3335daf0e55cec757fd66fe560e0b020ef':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 02:20:44 +00:00
Deepanshu Gupta
0df5ae65a9 am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 02:20:42 +00:00
Deepanshu Gupta
175851600c am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '26c373213592ce7fb5a09f23a3d9d3ca0727e346':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 02:20:38 +00:00
Deepanshu Gupta
3027b69e15 am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit 'f7e5794990831df87d4097126f6d24455da50efe':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 02:20:35 +00:00
Deepanshu Gupta
6d3c4ab245 am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '43b15371f9f1da7d97fe0500eb1536d981097e31':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 02:20:23 +00:00
Deepanshu Gupta
052e0c589e am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '770e40f839f059e1e3a15a2b14157c7cbb3b0553':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 02:20:20 +00:00
Deepanshu Gupta
9602fc1c00 am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '87665388466812897e888680c0b2a1d7db1b9cbd':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 02:20:16 +00:00
Deepanshu Gupta
c9a4badb54 am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'd915dcac365b6d3ad88afab52e74ccca7dfbefec':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 02:20:13 +00:00
Deepanshu Gupta
bdd8fbf6ea am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '877ae53586c3f7f5b788a40dfb0a58bef54a7446':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 02:20:10 +00:00
Deepanshu Gupta
01cdd3123f am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '669792b303b99a003bbcbf8d962f5be1debf9b63':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 02:20:07 +00:00
Deepanshu Gupta
d094742d2e am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'cda89ca02548c19250ae55671c055536b64b74f8':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 02:19:59 +00:00
Deepanshu Gupta
7bb8de580a am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit 'a2b34c96f1ef24d96854d1e23426dec7774510e8':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 02:19:56 +00:00
Deepanshu Gupta
69b3115e1c am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit 'e183855c1eb7baf750c67bb20e70fb887eba7af6':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 02:19:52 +00:00
Deepanshu Gupta
83b43dc0c9 am a8499a16: (-s ours) am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'a8499a1648d47f1b49df6c0a01681c085f9372e2':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 02:19:50 +00:00
Deepanshu Gupta
82d5bd98b7 am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit 'e5a2347bc6cf1506799136af4c9724275ca0247e':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 02:19:49 +00:00
Deepanshu Gupta
59889153ba am 7aaa59f0: (-s ours) am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '7aaa59f00ed277fdea2fed7ea23a8d24ee219cd2':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 02:19:48 +00:00
Deepanshu Gupta
d5de1bd630 am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit '30505abeb6cda9d042ec41f2563d561714eac46b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 02:19:46 +00:00
Deepanshu Gupta
b0d4ca6916 am d5260dcc: (-s ours) am d1f26941: am e69715b4: am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'd5260dcc67a862bf7936ababe01e27383ea91e31':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 02:19:45 +00:00
Deepanshu Gupta
cabb028c3f am cbf9d672: (-s ours) am 467305a4: am 70875517: am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'cbf9d672c687d8754823737245e2851516aab783':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 02:19:42 +00:00
Deepanshu Gupta
fe887a2a4c am 51b8ae6d: (-s ours) am de46e750: am d7f71e40: am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '51b8ae6d46c76c7d69e0bdd2d80e17bd27500458':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 02:19:39 +00:00
Deepanshu Gupta
f2851dd2c7 am 40ef74dd: (-s ours) am 512fd4c2: am 290b96f3: am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '40ef74dd1c53b78728270c833aa95784db013ae4':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 02:19:37 +00:00
Deepanshu Gupta
26d3fc3d08 am 4130946e: (-s ours) am 321a3fbd: am 3dc756a4: am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '4130946e3862426af101e60a820f8e6edaf47cba':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 02:19:33 +00:00
Deepanshu Gupta
1149ee7396 am 99615109: (-s ours) am 839506fa: am 4a6ae03d: am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '99615109e75909d2a8d769da0da098179f72c628':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 02:19:30 +00:00
Deepanshu Gupta
5bb2ca8d45 am 36f8cb3e: (-s ours) am c1172273: am 2f7d5d7c: am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit '36f8cb3e0850ea8e3d195d8c78676492fb26da2c':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-13 02:19:27 +00:00
Deepanshu Gupta
f6faba1518 am 62d9390d: (-s ours) am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '62d9390d2696ab78dd395e902cc0f267df3dbbc7':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 02:19:24 +00:00
Deepanshu Gupta
2b6aa287a6 am c8ab5109: (-s ours) am fd119e4b: am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE] 
* commit 'c8ab510903ab4ddf9106f04a4cb5bc8b6527fbc2':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 02:19:22 +00:00
Deepanshu Gupta
b4bc08a2d2 am 089b0d25: (-s ours) am 6c5f7556: am 4d23ae43: am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '089b0d25f9519d9e7fded7ecd9940097a9059d9e':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 02:19:19 +00:00
Deepanshu Gupta
3ea2131f5a am 8ef9e2f5: (-s ours) am 14569ecf: am e20ebd5a: am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '8ef9e2f57ed835723e6fbc1b45ba76eee11e373e':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 02:19:16 +00:00
Deepanshu Gupta
a7c0d02ad6 am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '0e50f1c2ca92c060e88a645d5607b47db9728ccc':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:16:50 +00:00
Deepanshu Gupta
51ce58a7bb am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '37f43311e1f25581de365b5733c0148c958554e5':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:16:48 +00:00
Deepanshu Gupta
888461c801 resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78
 2014-05-12 19:16:26 -07:00
Deepanshu Gupta
a8499a1648 am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'e4ea6a3067bfb99e90c59874dc7b5a8dede8742d':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 02:14:50 +00:00
Deepanshu Gupta
7aaa59f00e am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '74ae54e7dc485a82edb1b4876bc1ceaa60a0f34e':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 02:14:48 +00:00
Deepanshu Gupta
d5260dcc67 am d1f26941: am e69715b4: am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'd1f269417ef7c85ca1b541675216700cdd36ba05':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 02:14:45 +00:00
Deepanshu Gupta
cbf9d672c6 am 467305a4: am 70875517: am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '467305a4789023f903f55d931e8be91110aea92a':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 02:14:42 +00:00
Deepanshu Gupta
51b8ae6d46 am de46e750: am d7f71e40: am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit 'de46e750511581fe4fd06dc1b6ef26e5fbe922f5':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 02:14:38 +00:00
Deepanshu Gupta
40ef74dd1c am 512fd4c2: am 290b96f3: am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '512fd4c2e4244b63a97b25e147525e42b590325f':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 02:14:35 +00:00
Deepanshu Gupta
4130946e38 am 321a3fbd: am 3dc756a4: am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '321a3fbd5aec55b6c2792daebe37efbdfd789c0f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 02:14:32 +00:00
Deepanshu Gupta
99615109e7 am 839506fa: am 4a6ae03d: am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '839506fa6dd5775c43984487af462a23360c1a4c':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 02:14:29 +00:00