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

105245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
08d2007b33 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 a0fc1f46264e316449402525fbeb033138ec5f49)
 2014-05-30 14:49:59 -07:00
Deepanshu Gupta
fe6f30491f Remove @NonNull attribute [DO NOT MERGE] 
The tools prebuilt in this branch doesn't have the annotation.

Change-Id: I852f91c5202ed5f4c393d1226a4fa0b6fa4d63c1
 2014-05-30 14:49:51 -07:00
Deepanshu Gupta
866d40fc39 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 79f45b43db4dfd605d1e7ddd2c71be4ef8285269)
 2014-05-30 12:13:42 -07:00
Deepanshu Gupta
a0fc1f4626 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 8974a5e6d8408b4cd93f1befb05cc9b654b71e4a)
 2014-05-30 12:13:32 -07:00
Deepanshu Gupta
888dad0df7 am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit 'f33a2f62a54ef966375a7fe8706ce713386d843e':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-14 00:05:38 +00:00
Deepanshu Gupta
6e923e1b51 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '90d57721692e45fe6259136296e3cd5b669443fc':
  Fix build
 2014-05-14 00:05:35 +00:00
Deepanshu Gupta
f33a2f62a5 am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit 'f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-14 00:00:08 +00:00
Deepanshu Gupta
90d5772169 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '209745a32f0a68584aba57acf7c8d1de633b1cda':
  Fix build
 2014-05-14 00:00:05 +00:00
Deepanshu Gupta
f5af9a4a9a am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit '273c5c3c4c74d29a127e614726ce2e5c5e274c20':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:55:20 +00:00
Deepanshu Gupta
209745a32f am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'c251147a2b6f461427b1ce49f7066fadc97c1faf':
  Fix build
 2014-05-13 23:55:17 +00:00
Deepanshu Gupta
273c5c3c4c am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit '9ca7a039f73e5cf84f85282cf05d637517be2a17':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:54:21 +00:00
Deepanshu Gupta
c251147a2b am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '85ec144538de6c27b22dff1bd45491a334f626ef':
  Fix build
 2014-05-13 23:50:44 +00:00
Deepanshu Gupta
9ca7a039f7 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 2014-05-13 16:48:31 -07:00
Deepanshu Gupta
85ec144538 am f266873c: am 1c55797d: Fix build 
* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
  Fix build
 2014-05-13 23:45:30 +00:00
Deepanshu Gupta
e0be42a9f9 am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] 
* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:40:37 +00:00
Deepanshu Gupta
f266873c80 am 1c55797d: Fix build 
* commit '1c55797d0e786b6594e769c2fa424e1b8386648e':
  Fix build
 2014-05-13 23:40:34 +00: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
f41a380bd9 am d10ca17d: 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 'd10ca17d6feefd449595df1cb11d161c8f10dd57':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:07:45 +00:00
Deepanshu Gupta
ef24a5091b am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '900954e3cd135bf43db975961056e7661f26a6c6':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:07:40 +00:00
Deepanshu Gupta
4dff881b99 am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '7b9cc71063869a98f35b49c2e072750dfa46e0b9':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:07:38 +00:00
Deepanshu Gupta
203964c058 am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit 'b7e1bef1835bdb224d6ed09c3c219662e1db1f56':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:07:35 +00:00
Deepanshu Gupta
0eb268a0de am 22dabb52: (-s ours) 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 '22dabb52820d81744f46d009a27bf9294928bbee':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:07:31 +00:00
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
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
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
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
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