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

115572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
fb6e2f3b56 am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '9bfbe93a7e7165a7daef68175aa7dde9dbe0223a':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:47:30 +00:00
Deepanshu Gupta
9bfbe93a7e am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:43:50 +00:00
Deepanshu Gupta
dd46bfd095 am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '02d88f7b350e166da3b1f480c912351a5c72d00c':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:39:08 +00:00
Deepanshu Gupta
02d88f7b35 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:35:09 +00:00
Deepanshu Gupta
d056218b04 am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '661e158b0a754f1123485673ac050e388e8056a2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:57 +00:00
Deepanshu Gupta
ffbf24476c am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:30:50 +00:00
Deepanshu Gupta
661e158b0a am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:27:08 +00:00
Deepanshu Gupta
083af20d9d am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '531bdb5b57a7a903cea16baedb914e34df941651':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:25:48 +00:00
Deepanshu Gupta
2ac96a093b am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'a0fc1f46264e316449402525fbeb033138ec5f49':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:20 +00:00
Deepanshu Gupta
531bdb5b57 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fe6f30491f8506a4b2ad895a0f3e68de180e4243':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:21:08 +00: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
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
8974a5e6d8 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 e21c7ec8a02922a6bec19436897f9ee02be3d6c2)
 2014-05-30 11:59:59 -07:00
Jim Miller
607d59982a Fix crash in widget pager - DO NOT MERGE 
Fixes bug 14299491

Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f
 2014-05-16 22:18:49 +00:00
Deepanshu Gupta
9916c17e66 am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit '472cbad479b0f1361c816a2c0d5accb776fa3841':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-14 00:21:36 +00:00
Deepanshu Gupta
3a559d56a6 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae':
  Fix build
 2014-05-14 00:21:33 +00:00
Deepanshu Gupta
472cbad479 am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit 'f57871f799300614d37e93e376f9381fd01c2bcb':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-14 00:15:28 +00:00
Deepanshu Gupta
b5b4756565 am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '98822f0eba746b4f8c8a622f21c2d32dad08453f':
  Fix build
 2014-05-14 00:15:24 +00:00
Deepanshu Gupta
f57871f799 am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 
* commit '888dad0df765256f4b47268400425103106894f0':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-14 00:11:08 +00:00
Deepanshu Gupta
98822f0eba am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4':
  Fix build
 2014-05-14 00:11:06 +00: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
fea4b4dde3 am 3450dc32: am 06018d92: am f41a380b: 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 '3450dc325670cc8e7855c93193cf6f59cf7be430':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:23:50 +00:00
Deepanshu Gupta
69ab594625 am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit 'fcfb8801b27fd40ff27c380b8bad9b9a210effca':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:23:47 +00:00
Deepanshu Gupta
cdc40eb0e0 am 6fd1703e: (-s ours) am 0d33f604: am 4dff881b: 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 '6fd1703eb96669bb5c985c9de8d08107e800824c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:23:43 +00:00
Deepanshu Gupta
c909b4d53b am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '2322a9107b63928529c29cabc719575692d5d934':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:23:40 +00:00
Deepanshu Gupta
86726f58db am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: 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 'eb5b38b167dd5f094acc085ede494966ed0024c5':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:23:37 +00:00
Deepanshu Gupta
0573cffacc am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit 'b520cc45996de4a172147d4e934768ec6c417666':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:23:35 +00:00
Deepanshu Gupta
3450dc3256 am 06018d92: am f41a380b: 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 '06018d92e8eedecc8b567f5d4c797cd8096cfffa':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:18:06 +00:00
Deepanshu Gupta
fcfb8801b2 am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '18b1525ac7666933befd6085461391ad1087b19a':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:18:03 +00:00
Deepanshu Gupta
6fd1703eb9 am 0d33f604: am 4dff881b: 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 '0d33f604d61b843a988d1bf5b9e6b421f553808b':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:18:00 +00:00
Deepanshu Gupta
2322a9107b am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '75fc74d6dbc06872d13d0db0300b530dc90bdb01':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:17:57 +00:00
Deepanshu Gupta
eb5b38b167 am a350f96e: am 0eb268a0: 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 'a350f96ec97ce5ea6c61683f85f4e39fe45fa42b':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:17:54 +00:00
Deepanshu Gupta
b520cc4599 am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit 'cf2af66180e7debda36a1cece4732d0403ce37b7':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:17:51 +00:00
Deepanshu Gupta
06018d92e8 am f41a380b: 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 'f41a380bd97a25bee1804e43e8deba74fa100163':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:12:42 +00:00
Deepanshu Gupta
18b1525ac7 am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit 'ef24a5091b63fb512d4ca9eb34df6394c3842d33':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:12:39 +00:00
Deepanshu Gupta
0d33f604d6 am 4dff881b: 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 '4dff881b997e3e8c871068ae4b237a9e0f4ab2e7':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:12:37 +00:00
Deepanshu Gupta
75fc74d6db am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '203964c058857d01401c905918d0d64e83e51bab':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:12:35 +00:00