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

105032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
752b90f260 am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '919ce2051595dfa5dd047660946038d23fa688f4':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:07:28 +00:00
Deepanshu Gupta
919ce20515 am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '03bf747fec291b355af531bf0b04a2b1669bf92e':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:02:08 +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
9f5f450dca am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:54:20 +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
48931fcc0d am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a312214f736638486983874b4f266bb537bab723':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:49:25 +00:00
Deepanshu Gupta
34aa1bd392 am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '54b946fe3c0f86f4cba3bc5bc07d920b654a0ef0':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:49:22 +00:00
Deepanshu Gupta
e5c518cbd0 am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '4e8b055b2ad23f6e336872f775058bcf18c46dfd':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:49: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
a312214f73 am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '9358cf04dc0db493a8702a4a8051f9839e9de6d7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:43:18 +00:00
Deepanshu Gupta
54b946fe3c am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit 'f46900c5eaeff0fbba7f20466be87db67002d6bf':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:43:16 +00:00
Deepanshu Gupta
52b49665f5 am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'eff94bc3647c23c223abe4946595d51d80985eec':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:41:24 +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
eff94bc364 am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '8c19c6a17d8a019086a36988937462acfb6b830f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:36:24 +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
e14b24f3a0 am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '06ca4c6a4657c20ecb32bcfacabdc95c7063c99a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:51:50 +00:00
Deepanshu Gupta
41b3ef3ae2 am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '29171d5a9ae0f406128cf6c8cdf6ceeed0a0be49':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:51:47 +00:00
Deepanshu Gupta
06ca4c6a46 am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '1281853a17d24756223c8043b53225ffe8c8f03d':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:47:30 +00:00
Deepanshu Gupta
29171d5a9a am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit 'eb0360267a122680c5ccfb3312555811aeed5a38':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:47:27 +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
2d84de2fe7 am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '0d76fd64a1a4b0fa569d7b2a3ba4232415d75634':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:21:13 +00:00
Deepanshu Gupta
f29a051647 am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '0c11327b3c2053cfbc0ee267708df9affa4dbb41':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:21:10 +00:00
Deepanshu Gupta
4176415214 am 8a505e5c: (-s ours) am 74d2a533: 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 '8a505e5c6f8b677addca3bb27602416df95b66da':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:21:07 +00:00
Deepanshu Gupta
28c76e3e84 am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '5db08e87a1f3e2f7b2bac9dc55c81e84133923c1':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:21:04 +00:00
Deepanshu Gupta
471061ce3d am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit 'e74d437a172e69e0d758b2df055fea55a14009e4':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:21:01 +00:00
Deepanshu Gupta
0d76fd64a1 am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '3e7f0a20f7297c599c0ce5840c182668a15b207d':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:16:12 +00:00
Deepanshu Gupta
0c11327b3c am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'd4d66df6054ccd515cf5029bd5bd3b40de340883':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:16:09 +00:00
Deepanshu Gupta
8a505e5c6f am 74d2a533: 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 '74d2a533a4d815e1ef5c709837cc8f8484b715d4':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:16:06 +00:00
Deepanshu Gupta
5db08e87a1 am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'ce68e782e8cdfa8007b88b2461dd6e78bccc6fe9':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:16:03 +00:00
Deepanshu Gupta
e74d437a17 am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit 'c5c49dcd5c2fbb4463663d83cfd3eff8e05bba44':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:16:00 +00:00
Deepanshu Gupta
2f8da100ef am 81ac665c: (-s ours) am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '81ac665ca522fcfd9135b4c6fde6e3c25791bdc3':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 18:14:14 +00:00
Deepanshu Gupta
1eadb79e47 am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit 'fd8af673020786080a9aeddf39383233f5f0d8f0':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:14:11 +00:00
Deepanshu Gupta
910c7153fc am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'be0c94ea6b6867948a074476cf39a1c4b04c55ff':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:14:09 +00:00
Deepanshu Gupta
48e3d0fac8 am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit 'dbfd29d85503b4a9e4a75ae74186623705749bac':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:14:06 +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