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

92834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9c7e306446 am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '1b0f605667dc286b1a1f423b43c4b6957993daaf':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:00:16 +00:00
Deepanshu Gupta
b607cb82e0 am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '27c9b568ed6b24f68aeee0f2a1d7b3fa83bcc056':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:00:13 +00:00
Deepanshu Gupta
c261cb0dcd am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'f354d01afde602034e3d531eb7cbfe5fa5c48a21':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 20:56:33 +00:00
Deepanshu Gupta
03bf747fec am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '858ab06a38769aaa05a4b87a600739c9294b382d':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 20:56:31 +00:00
Deepanshu Gupta
1b0f605667 am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit 'c1847b54a391857f0871a15e97fbaae0fef0ff33':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 20:56:01 +00:00
Deepanshu Gupta
27c9b568ed am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit 'e969ee5e5ddc112df4759b308e3e1eafc9cbcf84':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 20:55:59 +00:00
Deepanshu Gupta
c1847b54a3 am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '5454be00b182b206bbc9dcd35b88da63631f7e8e':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 20:54:09 +00:00
Deepanshu Gupta
f354d01afd am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'aab60856f9df28da8246568621b59ed57bdc424b':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 20:51:14 +00:00
Deepanshu Gupta
858ab06a38 am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit 'ec1b4df6d2ccfe35c251344b43a29af65c3b56e1':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 20:51:11 +00:00
Deepanshu Gupta
e969ee5e5d resolved conflicts for merge of d388afad to jb-mr1.1-dev 2014-05-13 13:50:23 -07:00
Deepanshu Gupta
aab60856f9 am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'ebd909cca1f69028878f15e6fb0ece6e8c8da584':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 20:48:06 +00:00
Deepanshu Gupta
4e8b055b2a am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '6dad59e146dc16a2386124a5cd3b28411c024c4f':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:43:51 +00:00
Deepanshu Gupta
ec1b4df6d2 resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 2014-05-13 13:40:14 -07:00
Deepanshu Gupta
9358cf04dc am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:38:17 +00:00
Deepanshu Gupta
f46900c5ea am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '87a54055e61918986021eb5e1e3dbefe40839367':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:38:15 +00:00
Deepanshu Gupta
6dad59e146 am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '85b751949b3d383494523bb98b016157d76787f3':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:38:12 +00:00
Deepanshu Gupta
ccf6b34799 am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:33:33 +00:00
Deepanshu Gupta
87a54055e6 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '5878115a6e19041439b335efae066862e21775a1':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:33:30 +00:00
Deepanshu Gupta
85b751949b resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 2014-05-13 13:32:59 -07:00
Deepanshu Gupta
a154687620 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '7ef276450f3157cc68f714b0d5805319e6f4c555':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:31:33 +00:00
Deepanshu Gupta
8c19c6a17d am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '16f3a6167bdcbd49e47d843fcb43fe9ffd461531':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:30:39 +00:00
Deepanshu Gupta
5878115a6e resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 2014-05-13 13:29:07 -07:00
Deepanshu Gupta
16f3a6167b am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'c0e9c66d7d59873443714cc19e5cea8c044931bb':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:27:46 +00:00
Deepanshu Gupta
c0e9c66d7d resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 2014-05-13 11:43:45 -07:00
Deepanshu Gupta
1281853a17 am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '2de8509e30555594e9f39c410f458d5ffc8e7917':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:42:00 +00:00
Deepanshu Gupta
eb0360267a am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '14788ef3e70faed432b7bf643771d126d50a59c7':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:41:57 +00:00
Deepanshu Gupta
2de8509e30 am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '7d5299c28618b10c00c7e452d34d9b2485e478fe':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:36:14 +00:00
Deepanshu Gupta
14788ef3e7 am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit 'f8c568586d1affdfe61ec9f510e7b259d585e56b':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:36:12 +00:00
Deepanshu Gupta
7d5299c286 am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '0f26b5102574f0a989023485f4d63a9ac50107d2':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:30:46 +00:00
Deepanshu Gupta
3e7f0a20f7 am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '776c192379bcfa25d09d0881afca49f2e6f5edb5':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:11:28 +00:00
Deepanshu Gupta
d4d66df605 am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '26dd61c55ad515c0d4b14b8f799723a0f9985972':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:11:25 +00:00
Deepanshu Gupta
74d2a533a4 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] 
* commit 'bb7cfa1e1984342d896e664d0c8e2ed654e838cc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:11:23 +00:00
Deepanshu Gupta
ce68e782e8 am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'e535ff28728ad8edce7587110860963c0e571791':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:11:20 +00:00
Deepanshu Gupta
c5c49dcd5c am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '8b78a1d7e31355a3ba08e8905e45aefd905ef501':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:11:17 +00:00
Deepanshu Gupta
776c192379 am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '3c9fceaeb4a00c1f9b9728fa703d97894e718e81':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:05:48 +00:00
Deepanshu Gupta
26dd61c55a am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '07009057fee65896114a3c83bd762f6b22e1b645':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:05:46 +00:00
Deepanshu Gupta
bb7cfa1e19 am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '85c5cdcd587c64a9e80ac51beb134d9547faae54':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:05:44 +00:00
Deepanshu Gupta
e535ff2872 am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '488f624798837cf4fa441dce8675da7e8cb67788':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:05:41 +00:00
Deepanshu Gupta
8b78a1d7e3 am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '9f00e655db5b2b7c3527c20b60dc816eee6eff1d':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:05:39 +00:00
Deepanshu Gupta
f8c568586d resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 2014-05-13 11:04:29 -07:00
Deepanshu Gupta
060836bdf7 am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit 'fed25eb8b316d968154c204271ac0d239afd805e':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 18:03:44 +00:00
Deepanshu Gupta
9e614b25db am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '204316c5ac8b605a2389d898dfdf5d6a897b6f4d':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:03:41 +00:00
Deepanshu Gupta
be2184e425 am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'cfc9e4ed5df8c1bc9280d48b855fc48c54927064':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:03:38 +00:00
Deepanshu Gupta
81ff5ba73f am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '72e3fc1d37d38fcc09134be786e0f64a174a6ece':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:03:36 +00:00
Deepanshu Gupta
3c9fceaeb4 am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '627cab1257bbd80e74ad5db1963aeedbe056b462':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:02:38 +00:00
Deepanshu Gupta
07009057fe am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'effef17297dffc05511597ccc0f437deb278647f':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:02:35 +00:00
Deepanshu Gupta
85c5cdcd58 am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit 'c3a0c9f679cf18a512ca194e14a74dde852af831':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:02:32 +00:00
Deepanshu Gupta
488f624798 am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '835cbaa192f324ec14361afc700cc44a6bfa47b7':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:02:29 +00:00
Deepanshu Gupta
fed25eb8b3 am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit 'c233bb65bc10c20fa74fac55461a35c290cfb5f9':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 17:57:58 +00:00
Deepanshu Gupta
204316c5ac am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '8cf3343dc3e174f2459c21a1f75cf869c36f02c2':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 17:57:56 +00:00