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

96844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
d10ca17d6f am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '8921409a05c0e52ba453d3c4f37a9506fde9b321':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:02:23 +00:00
Deepanshu Gupta
900954e3cd am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '2100476ace68858bc7b7356b33aa525e38795592':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:02:19 +00:00
Deepanshu Gupta
7b9cc71063 am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '9c7e3064469e51a10503cfdf3d0215a62a3b6c8d':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:02:17 +00:00
Deepanshu Gupta
b7e1bef183 am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit 'b607cb82e0883a755fa6c6f9f5ec573cd79a731b':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:02:14 +00:00
Deepanshu Gupta
22dabb5282 am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:02:11 +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
8921409a05 am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '10fb4fe400625a95b3bc00b10b92814d7bc6f118':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:00:22 +00:00
Deepanshu Gupta
2100476ace am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:00:19 +00:00
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
10fb4fe400 am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit 'd99dd3e7322fa0071ca709e71ab34ae54677e3dc':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 20:56:07 +00:00
Deepanshu Gupta
31a3760a49 am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '964023c5dcd0334cdcf624eff26d791d9c9617a8':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 20:56:04 +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
d99dd3e732 am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '70efbad0648eb96e9becbd0529cc1f34b6ffb986':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 20:54:14 +00:00
Deepanshu Gupta
964023c5dc am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '8bf73eae6c98532c8a597b885b948b9878555441':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 20:54:12 +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
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
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
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
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
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
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