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

131242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
d7d7369402 am 0c556934: (-s ours) am c7832db5: am 1f21b31e: am 0c2aeb4a: am 8816bdfa: (-s ours) am 39daf02e: am 1eadb79e: 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 '0c5569347544c163fbefd1a9b01486bb1634a0fd':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:57:49 +00:00
Deepanshu Gupta
7ccb45ad25 am f79bb639: (-s ours) am 3dbb1123: am a42d321c: am 56d3c9d1: am 851aece2: (-s ours) am a63a1f9b: am 910c7153: 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 'f79bb63988d5d4db5e2c4653c4244f56f49549ae':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:57:46 +00:00
Deepanshu Gupta
158d601367 am e72f2c47: am 443019c3: am df7b20bd: am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit 'e72f2c477d18c2cc104335f9e804a8b3d09c6290':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:57:43 +00:00
Deepanshu Gupta
0c55693475 am c7832db5: am 1f21b31e: am 0c2aeb4a: am 8816bdfa: (-s ours) am 39daf02e: am 1eadb79e: 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 'c7832db554b01860c3f14b3b81e44cc570f45f65':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:53:26 +00:00
Deepanshu Gupta
f79bb63988 am 3dbb1123: am a42d321c: am 56d3c9d1: am 851aece2: (-s ours) am a63a1f9b: am 910c7153: 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 '3dbb1123f14a8c59aa9347f0bdde4359b74f0ced':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:53:22 +00:00
Deepanshu Gupta
e72f2c477d am 443019c3: am df7b20bd: am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '443019c36af8ee9bb5def50cb882d3cdda024d85':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:53:20 +00:00
Deepanshu Gupta
c7832db554 am 1f21b31e: am 0c2aeb4a: am 8816bdfa: (-s ours) am 39daf02e: am 1eadb79e: 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 '1f21b31ed51e58c996d428434885e7ca3e1e9367':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:47:42 +00:00
Deepanshu Gupta
3dbb1123f1 am a42d321c: am 56d3c9d1: am 851aece2: (-s ours) am a63a1f9b: am 910c7153: 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 'a42d321c6ac7eef80d24e3b178306418926ce659':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:47:39 +00:00
Deepanshu Gupta
443019c36a am df7b20bd: am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit 'df7b20bd0c5b64d945f999fc9eb48b8cd4262127':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:47:35 +00:00
Deepanshu Gupta
1922bb9cd1 am 84f5beed: am f2650430: am 403cc2f9: am b1cf6a87: am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '84f5beed2a4564b53b246f418f7d9ae55fccf760':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:42:31 +00:00
Deepanshu Gupta
1f21b31ed5 am 0c2aeb4a: am 8816bdfa: (-s ours) am 39daf02e: am 1eadb79e: 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 '0c2aeb4a2e221b4860a5855975065bda7a33a4f4':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:41:42 +00:00
Deepanshu Gupta
a42d321c6a am 56d3c9d1: am 851aece2: (-s ours) am a63a1f9b: am 910c7153: 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 '56d3c9d13fd846f99dd36ab5c68b793ef092906f':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:41:39 +00:00
Deepanshu Gupta
df7b20bd0c am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '0ac96e704597533ca702d082ac9d4857e5a80723':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:41:36 +00:00
Adam Lesinski
f38000cbd8 Merge "Quick fix to ensure mipmap doesn't get stripped by AAPT" 2014-05-13 18:39:17 +00:00
Deepanshu Gupta
0c2aeb4a2e am 8816bdfa: (-s ours) am 39daf02e: am 1eadb79e: 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 '8816bdfa3b776c09f2e9860c75cd830bdadac7a5':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:36:29 +00:00
Deepanshu Gupta
56d3c9d13f am 851aece2: (-s ours) am a63a1f9b: am 910c7153: 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 '851aece2c8a9e9d6a058ffa3f12d8424abaeaa95':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:36:26 +00:00
Deepanshu Gupta
0ac96e7045 am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '1ba65c7a8951d6de64d2e3582f5aa6fa4f5a0549':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:36:23 +00:00
Deepanshu Gupta
84f5beed2a am f2650430: am 403cc2f9: am b1cf6a87: am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit 'f26504308af3f63f8732cfc1c738456d046486ca':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:36:04 +00:00
Deepanshu Gupta
8816bdfa3b am 39daf02e: am 1eadb79e: 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 '39daf02eb1a6035e0484792e1ecbd15d1d84906e':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:25:16 +00:00
Deepanshu Gupta
851aece2c8 am a63a1f9b: am 910c7153: 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 'a63a1f9b0eb414a2bcc74e7d70d04ac2205d3004':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:25:13 +00:00
Deepanshu Gupta
1ba65c7a89 am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit 'af6dcd4f956b74e1af8f3558412bbc847d4bcd71':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:25:10 +00:00
Deepanshu Gupta
f26504308a am 403cc2f9: am b1cf6a87: am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '403cc2f9e5cfbf27527bd58c647d8f48a72ed418':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:23:49 +00:00
Deepanshu Gupta
403cc2f9e5 am b1cf6a87: am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit 'b1cf6a87e431054632bfb5ec512f3c4680700f9e':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:20:56 +00:00
Deepanshu Gupta
39daf02eb1 am 1eadb79e: 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 '1eadb79e470cd86a1a32f9cdda997b054aa1efe0':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:19:09 +00:00
Deepanshu Gupta
a63a1f9b0e am 910c7153: 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 '910c7153fc5f225eb98209a4fd2d03f183833651':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:19:07 +00:00
Deepanshu Gupta
af6dcd4f95 am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '48e3d0fac84657f14991cbb14b23fb229a4f6362':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:19:05 +00:00
Jeff Davidson
e4d29f75f1 Merge "Mark network score permission strings as untranslatable." 2014-05-13 18:17:28 +00:00
Deepanshu Gupta
b1cf6a87e4 am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit 'a7ed116d0f0b677f0986e0861d4beaf3d360a9d4':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:16:50 +00:00
Deepanshu Gupta
ec9eec95e2 am 024c4587: am d290aa3d: am e36126e0: am 862e64ad: am bacf26f4: (-s ours) am 8b53c5b1: am ebcbb283: am 0b2f4a18: (-s ours) am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [D 
* commit '024c45876c110a72e64c2c57e0d5688c11715479':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 18:16:03 +00:00
Deepanshu Gupta
425645c738 am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '567f948b60e9a647610454745b0629c136d492db':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 18:15:58 +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
a7ed116d0f am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '5dce0a4b3d933e5d7174ba487fd180b6165d2923':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:11:14 +00:00
Deepanshu Gupta
fd8af67302 am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '9e614b25db75950d6b08f937f15c0bc0df74803f':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:09:06 +00:00
Deepanshu Gupta
be0c94ea6b 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 'be2184e425bae9212d81fd90e4d7cc4f67ca9d0e':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:09:02 +00:00
Deepanshu Gupta
dbfd29d855 am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '81ff5ba73f5c5c098cf4d2f46f360852bccf63da':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:08:59 +00:00
Deepanshu Gupta
5dce0a4b3d am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit 'a1191b467d9687cd34e0cec2d4ac827f6020c160':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:05:51 +00:00
Jeff Davidson
6006c1a546 Mark network score permission strings as untranslatable. 
Bug: 14615157
Change-Id: Id11d24d502ab70e6590cf5ec22faa6352c012af7
 2014-05-13 11:04:36 -07: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
024c45876c am d290aa3d: am e36126e0: am 862e64ad: am bacf26f4: (-s ours) am 8b53c5b1: am ebcbb283: am 0b2f4a18: (-s ours) am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit 'd290aa3d682f548df61bd5933de85f78e6e09657':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 18:01:07 +00:00
Deepanshu Gupta
567f948b60 am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '872a5a1a93eef53a18d18778104bb8669b4bc073':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 18:01:02 +00:00
Deepanshu Gupta
a1191b467d am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '74503f66e0cb5a4ea617c4a66882e8c33e5cc888':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:01:00 +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
Adam Lesinski
3921e87e6e Quick fix to ensure mipmap doesn't get stripped by AAPT 
This is a quick fix. A refactoring is already underway to properly
solve this problem.

Bug:14857725
Change-Id: Ic0c475aa0b180803a687904ad9f71eb87e137a25
 2014-05-13 10:57:53 -07:00
Deepanshu Gupta
cfc9e4ed5d am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd62dcc2958b75ec855f93f2b116ce47b1c5d8ecf':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 17:57:52 +00:00
Deepanshu Gupta
72e3fc1d37 am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '6f58831c64d01df7e0a80bcb47b54ea7a53a2e14':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 17:57:41 +00:00
Deepanshu Gupta
74503f66e0 am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 17:56:55 +00:00