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

88448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:10 +00:00
Deepanshu Gupta
3b7c09b433 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 08d2007b33838570a96c8df890f0757fa920904c)
 2014-05-30 14:50:39 -07:00
Deepanshu Gupta
40bfb60efa Fix build due to incorrect merges [DO NOT MERGE] 
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
 2014-05-13 15:52:39 -07:00
Deepanshu Gupta
1c55797d0e Fix build 
remove a line that shouldn't have been merged into this branch.

The build will still be broken for this branch, but this will fix it for
many branches downstream.

Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
 2014-05-13 15:47:04 -07:00
Deepanshu Gupta
bd5a3e6510 am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '1677a9bdeba3961625236925e754920fca1b7e89':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 17:53:55 +00:00
Deepanshu Gupta
0ad4f2cedd resolved conflicts for merge of 7377c7be to jb-mr1-dev 
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
 2014-05-13 10:44:24 -07:00
Deepanshu Gupta
5dae7fda38 am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '9359dc2e7d6bc671af3fee0c1dc540dd3685365c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 17:40:55 +00:00
Deepanshu Gupta
b6de60e002 am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 17:40:52 +00:00
Deepanshu Gupta
ae5e0c7b9f am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '4eab4e14c8453a0b41923c714a05dccdd72d7829':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 17:40:49 +00:00
Deepanshu Gupta
673d9734c2 resolved conflicts for merge of 00d09649 to jb-mr1-dev 
Change-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a
 2014-05-13 10:17:09 -07:00
Deepanshu Gupta
5280c911d8 am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '0df5ae65a91174c99d1af633b45b3a1a7861cd1c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 17:11:26 +00:00
Deepanshu Gupta
f192096a13 am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '175851600c7757c73f91d1be0f960de157228b1c':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 17:11:23 +00:00
Deepanshu Gupta
1867f58d6c am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '3027b69e154cffc6e286caf90b0f9af01c473c14':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 17:11:20 +00:00
Deepanshu Gupta
a5461ebfae resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev 
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
 2014-05-13 09:40:35 -07:00
Deepanshu Gupta
9053261a54 am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 16:32:02 +00:00
Deepanshu Gupta
5594616c4f am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '9602fc1c00e5e5cdf26cdc3fe22022ffcd115361':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 16:31:59 +00:00
Deepanshu Gupta
45693e50ec am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 16:31:53 +00:00
Deepanshu Gupta
e3b43270e8 am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 16:31:50 +00:00
Deepanshu Gupta
45ca5ba7dc am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '01cdd3123f408dc41a2bd4786f3a943157ab6c69':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:47 +00:00
Deepanshu Gupta
9f9652587d am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'd094742d2e19371291409886bb80f070df099533':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 16:31:44 +00:00
Deepanshu Gupta
8c5c2410ae am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit '7bb8de580a451621480913d7839fd7eb784ab689':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 16:31:41 +00:00
Deepanshu Gupta
48bf7b49bb am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 16:31:38 +00:00
Deepanshu Gupta
94d33cfce1 am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '82d5bd98b77a9955e375b075e262639625c40232':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:35 +00:00
Deepanshu Gupta
d4e6727d02 am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd5de1bd6305dc8885027504996602755b1e79099':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 16:31:31 +00:00
Deepanshu Gupta
ed98abecad am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 16:31:28 +00:00
Deepanshu Gupta
2cbe100a9b am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '40fea8b1bf689933e63941b5fa5e3379f82c88b5':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:23 +00:00
Deepanshu Gupta
632c9e2dab am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '065ce2e8b3e11ff8bb1699748edbd23d272bc8a6':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 16:31:20 +00:00
Deepanshu Gupta
1677a9bdeb Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 2014-05-13 02:32:31 +00:00
Deepanshu Gupta
51cce0ec42 resolve conflicts for merge 5a7b3b65 correctly 
Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
 2014-05-12 19:31:25 -07: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
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
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
2fb139e02c resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
 2014-05-12 19:01:41 -07:00